public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-18 01:38:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复下载远程Excel文件失败

Browse Source
This commit is contained in:
taojinlong
2025-03-10 14:46:38 +08:00
committed by taojinlong
parent 9b9329e081
commit 3a5de957bb
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
View File

@@ -422,8 +422,8 @@ public class ExcelUtils {
Map<String, String> fileNames = new HashMap<>();
if (remoteExcelRequest.getUrl().trim().startsWith("http")) {
HttpClientConfig httpClientConfig = new HttpClientConfig();
if (StringUtils.isNotEmpty(remoteExcelRequest.getUsername()) && StringUtils.isNotEmpty(remoteExcelRequest.getPassword())) {
String authValue = "Basic " + Base64.getUrlEncoder().encodeToString((remoteExcelRequest.getUsername() + ":" + remoteExcelRequest.getPassword()).getBytes());
if (StringUtils.isNotEmpty(remoteExcelRequest.getUserName()) && StringUtils.isNotEmpty(remoteExcelRequest.getPasswd())) {
String authValue = "Basic " + Base64.getUrlEncoder().encodeToString((new String(Base64.getDecoder().decode(remoteExcelRequest.getUserName())) + ":" + new String(Base64.getDecoder().decode(remoteExcelRequest.getPasswd()))).getBytes());
httpClientConfig.addHeader("Authorization", authValue);
}
File p = new File(path);
@@ -755,9 +755,9 @@ public class ExcelUtils {
DEException.throwException("无效的地址！");
}
}
if (StringUtils.isNotEmpty(remoteExcelRequest.getUsername()) && StringUtils.isNotEmpty(remoteExcelRequest.getPassword())) {
username = remoteExcelRequest.getUsername();
password = remoteExcelRequest.getPassword();
if (StringUtils.isNotEmpty(remoteExcelRequest.getUserName()) && StringUtils.isNotEmpty(remoteExcelRequest.getPasswd())) {
username = new String(Base64.getDecoder().decode(remoteExcelRequest.getUserName()));
password = new String(Base64.getDecoder().decode(remoteExcelRequest.getPasswd()));
}
int port = 21;
String suffix = filePath.substring(filePath.lastIndexOf(".") + 1);

7
core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue
View File

@@ -382,6 +382,8 @@ const loadData = () => {
remoteExcelForm.value.validate(val => {
if (val) {
const request = JSON.parse(JSON.stringify(form.value.configuration))
request.userName = Base64.encode(request.userName)
request.passwd = Base64.encode(request.passwd)
request.datasourceId = form.value.id || 0
request.editType = form.value.editType
loading.value = true
@@ -411,6 +413,11 @@ const loadData = () => {
const uploadSuccess = response => {
if (!response) {
state.excelData = []
activeTab.value = ''
tabList.value = []
Object.assign(sheetObj, cloneDeep(defaultSheetObj))
ElMessage.warning(response.msg)
return
}
if (response?.code !== 0) {

2
core/core-frontend/src/views/visualized/data/datasource/form/index.vue
View File

@@ -410,6 +410,8 @@ const doValidateDs = request => {
let excelRequest = JSON.parse(JSON.stringify(form2.configuration))
excelRequest.datasourceId = form2.id || 0
excelRequest.editType = form2.editType
excelRequest.userName = Base64.encode(request.userName)
excelRequest.passwd = Base64.encode(request.passwd)
return loadRemoteFile(excelRequest)
.then(() => {
ElMessage.success(t('datasource.validate_success'))

4
sdk/api/api-base/src/main/java/io/dataease/api/ds/vo/ExcelConfiguration.java
View File

@@ -8,6 +8,6 @@ import java.util.List;
public class ExcelConfiguration {
private String url;
private List<ExcelSheetData> sheets;
private String username;
private String password;
private String userName;
private String passwd;
}