diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlController.java index 41a83c7e..46ca90f4 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDmlController.java @@ -70,7 +70,7 @@ public class RdbDmlController { ListResult resultDTOListResult = dlTemplateService.execute(param); List resultVOS = rdbWebConverter.dto2vo(resultDTOListResult.getData()); String type = Chat2DBContext.getConnectInfo().getDbType(); - String clientId = getApiKey(); + String clientId = getClientId(request.getClientId()); String sqlContent = request.getSql(); executorService.submit(() -> { try { @@ -102,11 +102,11 @@ public class RdbDmlController { * * @return */ - private String getApiKey() { + private String getClientId(String clientId) { ConfigService configService = ApplicationContextUtil.getBean(ConfigService.class); Config keyConfig = configService.find(Chat2dbAIClient.CHAT2DB_OPENAI_KEY).getData(); if (Objects.isNull(keyConfig) || StringUtils.isBlank(keyConfig.getContent())) { - return null; + return clientId; } return keyConfig.getContent(); } @@ -149,7 +149,7 @@ public class RdbDmlController { ExecuteResultVO executeResultVO = rdbWebConverter.dto2vo(result.getData()); String type = Chat2DBContext.getConnectInfo().getDbType(); String sqlContent = request.getSql(); - String clientId = getApiKey(); + String clientId = getClientId(request.getClientId()); executorService.submit(() -> { try { addOperationLog(clientId, type, sqlContent, result.getErrorMessage(), result.getSuccess(), Lists.newArrayList(executeResultVO)); diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/request/DmlRequest.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/request/DmlRequest.java index b6a879cf..dabd21b1 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/request/DmlRequest.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/request/DmlRequest.java @@ -44,4 +44,9 @@ public class DmlRequest extends DataSourceBaseRequest implements DataSourceConso * 只有select语句才有 */ private Boolean pageSizeAll; + + /** + * 客户端id + */ + private String clientId; }