center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor(X-Pack): 移除hutool后第三方平台消息推送使用httpclient重构

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-01-29 18:46:12 +08:00
parent 4330ff6e01
commit 5b50dd65ab
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/plugins/server/CasServer.java
View File

@ -67,7 +67,7 @@ public class CasServer {
sysUserEntity = authUserService.getCasUserByName(name);
}
if (null == sysUserEntity) {
String s = RandomStringUtils.random(6);
String s = RandomStringUtils.randomAlphanumeric(6);
String email = s + "@xxx.com";
sysUserService.validateCasUser(name);
sysUserService.saveCASUser(name, email);

26
sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/FileUtil.java
View File

@ -2,10 +2,7 @@ package io.dataease.plugins.common.util;
import io.dataease.plugins.common.exception.DataEaseException;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.Arrays;
@ -35,6 +32,25 @@ public class FileUtil {
return bytes;
}
public static void writeBytes(File file, byte[] bytes) {
FileOutputStream fos = null;
try {
fos = new FileOutputStream(file);
fos.write(bytes);
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
if (fos != null) {
try {
fos.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
}
public static String getSuffix(String fileName) {
return fileName.substring(fileName.lastIndexOf(".") + 1);
}
@ -54,7 +70,7 @@ public class FileUtil {
return new File(path).exists();
}
public static List<String> listFileNames(String dirPath){
public static List<String> listFileNames(String dirPath) {
File file = new File(dirPath);
if (!file.exists()) return null;
File[] files = file.listFiles();

29
sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/util/HttpClientUtil.java
View File

@ -17,9 +17,7 @@ import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.HttpMultipartMode;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
@ -219,26 +217,28 @@ public class HttpClientUtil {
public static String postFile(String fileServer, File file, Map<String, String> param, HttpClientConfig config) {
CloseableHttpClient httpClient = HttpClients.createDefault();
CloseableHttpClient httpClient = buildHttpClient(fileServer);
HttpPost postRequest = new HttpPost(fileServer);
if (config == null) {
config = new HttpClientConfig();
}
postRequest.setConfig(config.buildRequestConfig());
Map<String, String> header = config.getHeader();
String fileFlag = param.get("fileFlag");
String fileName = param.get("fileName");
param.remove("fileFlag");
param.remove("fileName");
if (MapUtils.isNotEmpty(header)) {
for (String key : header.keySet()) {
postRequest.addHeader(key, header.get(key));
}
}
postRequest.setHeader("Content-Type", "multipart/form-data");
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
builder.setCharset(StandardCharsets.UTF_8);
FileBody fileBody = new FileBody(file);
builder.addPart(file.getName(), fileBody);
if (param != null) {
builder.addBinaryBody(StringUtils.isNotBlank(fileFlag) ? fileFlag : "file", file, ContentType.APPLICATION_OCTET_STREAM, StringUtils.isNotBlank(fileName) ? fileName : file.getName());
if (MapUtils.isNotEmpty(param)) {
for (Map.Entry<String, String> entry : param.entrySet()) {
StringBody stringBody = new StringBody(entry.getValue(), ContentType.TEXT_PLAIN.withCharset("utf-8"));
builder.addPart(entry.getKey(), stringBody);
}
@ -253,11 +253,13 @@ public class HttpClientUtil {
}
public static String postFile(String fileServer, byte[] bytes, String fileName, Map<String, String> param, HttpClientConfig config) {
CloseableHttpClient httpClient = HttpClients.createDefault();
CloseableHttpClient httpClient = buildHttpClient(fileServer);
HttpPost postRequest = new HttpPost(fileServer);
if (config == null) {
config = new HttpClientConfig();
}
postRequest.setConfig(config.buildRequestConfig());
Map<String, String> header = config.getHeader();
if (MapUtils.isNotEmpty(header)) {
for (String key : header.keySet()) {
@ -265,15 +267,12 @@ public class HttpClientUtil {
}
}
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
builder.setCharset(StandardCharsets.UTF_8);
builder.addBinaryBody(fileName, bytes);
builder.addBinaryBody("image", bytes, ContentType.DEFAULT_BINARY, fileName);
if (param != null) {
for (Map.Entry<String, String> entry : param.entrySet()) {
StringBody stringBody = new StringBody(entry.getValue(), ContentType.TEXT_PLAIN.withCharset("utf-8"));
builder.addPart(entry.getKey(), stringBody);
builder.addTextBody(entry.getKey(), entry.getValue());
}
}
try {