Skip to content

fix: 解决数据源新增和修改时密码无法保存的问题 #493 #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZhangDT-sky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: 解决数据源新增和修改时密码无法保存的问题 #493 #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions data-agent-management/src/main/java/com/alibaba/cloud/ai/dataagent/entity/Datasource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package com.alibaba.cloud.ai.dataagent.entity;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Builder;
import org.springframework.format.annotation.DateTimeFormat;

Expand Down Expand Up @@ -45,10 +45,10 @@ public class Datasource {

private String username;

@JsonIgnore
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String password;

@JsonIgnore
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String connectionUrl;

private String status;
Expand Down
9 changes: 7 additions & 2 deletions ...in/java/com/alibaba/cloud/ai/dataagent/service/datasource/impl/DatasourceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ public Datasource createDatasource(Datasource datasource) {

@Override
public Datasource updateDatasource(Integer id, Datasource datasource) {
Datasource existingDatasource = datasourceMapper.selectById(id);
if (existingDatasource == null) {
throw new RuntimeException("Datasource not found with id: " + id);
}

// Regenerate connection URL
DatasourceTypeHandler handler = datasourceTypeHandlerRegistry.getRequired(datasource.getType());
String connectionUrl = handler.resolveConnectionUrl(datasource);
Expand All @@ -124,11 +129,11 @@ public Datasource updateDatasource(Integer id, Datasource datasource) {
datasource.setId(id);

if (datasource.getPassword() == null) {
datasource.setPassword("");
datasource.setPassword(existingDatasource.getPassword());
}

if (datasource.getUsername() == null) {
datasource.setUsername("");
datasource.setUsername(existingDatasource.getUsername());
}

datasourceMapper.updateById(datasource);
Expand Down
Loading