From 844fed8af4d3c6664fd3bcdb052a1713b0ee0f08 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Mon, 30 Sep 2024 13:48:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/operational/src/main/resources/db/3.0.4.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/operational/src/main/resources/db/3.0.4.sql b/hzims-service/operational/src/main/resources/db/3.0.4.sql index f7f54cb..7a74a6c 100644 --- a/hzims-service/operational/src/main/resources/db/3.0.4.sql +++ b/hzims-service/operational/src/main/resources/db/3.0.4.sql @@ -73,4 +73,4 @@ CREATE TABLE IF NOT EXISTS `hzims_user_dept_config` ( ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; -- 站点表增加离线状态 -ALTER TABLE `hzims_operation`.`hzims_station` ADD COLUMN `ON_LINE` tinyint(1) UNSIGNED ZEROFILL NULL DEFAULT 0 COMMENT '站点在线状态 0-在线 1-离线' AFTER `DISCHARGE`; +ALTER TABLE `hzims_operation`.`hzims_station` ADD COLUMN `ON_LINE` tinyint(1) UNSIGNED ZEROFILL NULL DEFAULT 0 COMMENT '站点在线状态 0-在线 1-离线'; From 10afe53f3e0635bed6517182353ba650d19d73a6 Mon Sep 17 00:00:00 2001 From: luyie Date: Mon, 30 Sep 2024 15:09:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add:url=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?https=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/common/utils/FileUtil.java | 115 +++++++++------------ 1 file changed, 46 insertions(+), 69 deletions(-) diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/FileUtil.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/FileUtil.java index 21c2583..0663c1f 100644 --- a/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/FileUtil.java +++ b/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/FileUtil.java @@ -11,13 +11,20 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.util.EntityUtils; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.web.multipart.MultipartFile; +import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import java.io.*; +import java.net.HttpURLConnection; import java.net.URL; -import java.net.URLDecoder; +import java.net.URLConnection; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; import java.util.Base64; +import java.util.UUID; /** * @Author: ypj @@ -43,12 +50,16 @@ public class FileUtil { return bytes; } - public static byte[] getUrlByte(URL url) throws IOException { - InputStream inputStream = null; + public static byte[] getUrlByte(URL url) throws IOException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException { + URLConnection conn = getUrlConnection(url); + conn.connect(); + return getUrlByte(conn.getInputStream()); + } + + public static byte[] getUrlByte(InputStream inputStream) throws IOException { ByteArrayOutputStream outputStream = null; byte[] fileBytes = null; try { - inputStream = url.openStream(); outputStream = new ByteArrayOutputStream(); byte[] buffer = new byte[4096]; int bytesRead; @@ -67,80 +78,46 @@ public class FileUtil { return fileBytes; } - public static byte[] getUrlByte(String urlString) throws IOException { + public static byte[] getUrlByte(String urlString) throws IOException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException { return getUrlByte(new URL(urlString)); } - public static String getContentTypeFromUrl(String url) { - String result = ""; - String fileType = url.toLowerCase(); - if (fileType.indexOf(".png") >= 0) { - result = "image/png"; - } else if (fileType.indexOf(".gif") >= 0) { - result = "image/gif"; - } else if (fileType.indexOf(".jpg") >= 0 || fileType.indexOf(".jpeg") >= 0) { - result = "image/jpeg"; - } else if (fileType.indexOf(".svg") >= 0) { - result = "image/svg+xml"; - } else if (fileType.indexOf(".doc") >= 0) { - result = "application/msword"; - } else if (fileType.indexOf(".xls") >= 0) { - result = "application/x-excel"; - } else if (fileType.indexOf(".zip") >= 0) { - result = "application/zip"; - } else if (fileType.indexOf(".pdf") >= 0) { - result = "application/pdf"; - } else if (fileType.indexOf(".mpeg") >= 0) { //MP3 - result = "audio/mpeg"; - } else if (fileType.indexOf(".mp4") >= 0) { - result = "video/mp4"; - } else if (fileType.indexOf(".plain") >= 0) { - result = "text/plain"; - } else if (fileType.indexOf(".html") >= 0) { - result = "text/html"; - } else if (fileType.indexOf(".json") >= 0) { - result = "application/json"; - } else { - result = "application/octet-stream"; - } - return result; + public static String getUrlBase64(String urlString) throws KeyManagementException, NoSuchAlgorithmException, KeyStoreException, IOException { + return getBase64(getUrlByte(urlString)); } - public static String getPureUrl(String url) throws UnsupportedEncodingException { - String result = removeUrlParam(url); - result = URLDecoder.decode(result, "utf-8"); - int index = result.lastIndexOf("http"); - if (index > 0) { - result = result.substring(index); + public static URLConnection getUrlConnection(URL url) throws IOException, KeyStoreException, NoSuchAlgorithmException, KeyManagementException { + URLConnection conn = url.openConnection(); + if (url.getProtocol().equalsIgnoreCase("https")) { + SSLContext sslContext = SSLContextBuilder.create().loadTrustMaterial(null, (x509Certificate, s) -> true).build(); + ((HttpsURLConnection) conn).setSSLSocketFactory(sslContext.getSocketFactory()); + ((HttpsURLConnection) conn).setHostnameVerifier(NoopHostnameVerifier.INSTANCE); } - return result; + ((HttpURLConnection) conn).setRequestMethod("GET"); + conn.setRequestProperty("User-Agent", "Mozilla/5.0"); + conn.setRequestProperty("Accept", "*/*"); + return conn; } - public static String getOriginalFilename(String path) { - String result = path; - int index = path.lastIndexOf("/"); - if (index > 0) { - result = path.substring(index + 1); - } - return result; + public static URLConnection getUrlConnection(String urlString) throws IOException, KeyStoreException, NoSuchAlgorithmException, KeyManagementException { + URL url = new URL(urlString); + return getUrlConnection(url); } - public static String removeUrlParam(String url) { - int index = url.indexOf("?"); - if (index > 0) { - return url.substring(0, index); - } - return url; - } - - public static ByteArrayMultipartFile getMultipartFileFromUrl(String urlStr) throws IOException { + public static ByteArrayMultipartFile getMultipartFileFromUrl(String urlStr, String fileName) { ByteArrayMultipartFile result = null; - URL url = new URL(urlStr); - byte[] bytes = getUrlByte(url); - String name = url.getPath(); - String originalName = getOriginalFilename(name); - String contentType = getContentTypeFromUrl(originalName); - result = new ByteArrayMultipartFile(name, originalName, contentType, bytes); + try { + URL url = new URL(urlStr); + URLConnection conn = getUrlConnection(url); + conn.connect(); + byte[] bytes = getUrlByte(conn.getInputStream()); + String name = url.getPath(); + String originalName = StringUtil.isBlank(fileName) ? UUID.randomUUID().toString() : fileName; + String contentType = conn.getContentType(); + result = new ByteArrayMultipartFile(name, originalName, contentType, bytes); + } catch (Exception e) { + log.error("获取传输文件失败", e); + } return result; } @@ -148,11 +125,11 @@ public class FileUtil { return Base64.getEncoder().encodeToString(bytes); } - public static String getBase64(String filePath) throws IOException { + public static String getFileBase64(String filePath) throws IOException { return getBase64(getFileBytes(filePath)); } - public static String getBase64(URL url) throws IOException { + public static String getUrlBase64(URL url) throws IOException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException { return getBase64(getUrlByte(url)); }