From 9f6f07f1649f01258aaad541d9fa1dfca63641c0 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 11:59:58 +0800
Subject: [PATCH] 日期
---
ruoyi-admin/src/main/resources/application-prod.yml | 2 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 12 +++++++-----
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java | 6 ++++++
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java | 7 +++++--
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index c5238d5..2d96cc0 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -262,6 +262,6 @@
--- #杈圭晫
police:
- localhost: http://192.168.3.43:8080 #娴嬭瘯
+ localhost: http://192.168.3.228:8801 #娴嬭瘯
chief: http://10.248.255.130:18080 #鏀垮姟浜�
video: http://51.9.1.41:18080 #瑙嗛缃�
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java
index ae445c2..628e5ac 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/SynchronousRequest.java
@@ -1,11 +1,13 @@
package org.dromara.common.oss.entity;
import lombok.Data;
+import lombok.NoArgsConstructor;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.Date;
+@NoArgsConstructor
@Data
public class SynchronousRequest {
@@ -16,7 +18,7 @@
//ossId
private String ossId;
//鍒涘缓鏃堕棿
-// private Date createTime;
+ private String createTime;
//鍒涘缓浜�
private String createBy;
//瀵嗙爜
@@ -30,9 +32,10 @@
"file=" + file +
", path='" + path + '\'' +
", ossId='" + ossId + '\'' +
-// ", createTime=" + createTime +
+ ", createTime=" + createTime +
", createBy='" + createBy + '\'' +
", password='" + password + '\'' +
+ ", fileName='" + fileName + '\'' +
'}';
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 24b412d..9fb83c1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -47,6 +47,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -200,10 +201,11 @@
baseMapper.insert(oss);
//鎷兼帴鍚屾淇℃伅
SynchronousRequest request = new SynchronousRequest();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
request.setFile(file);
- request.setFileName(oss.getFileName());
+ request.setFileName(oss.getOriginalName());
request.setPath(uploadResult.getFilename() + "1");
-// request.setCreateTime(new Date());
+ request.setCreateTime(format.format(oss.getCreateTime()));
request.setPassword(oss.getPassword());
request.setCreateBy(String.valueOf(oss.getCreateBy()));
// request.setOssId(String.valueOf(oss.getOssId()));
@@ -234,8 +236,8 @@
oss.setOssId(Long.valueOf(ossId));
oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix);
- oss.setFileName(fileName);
- oss.setOriginalName(originalfileName);
+ oss.setFileName(uploadResult.getFilename());
+ oss.setOriginalName(fileName);
oss.setService(configKey);
oss.setPassword(password);
oss.setCreateTime(new Date());
@@ -299,7 +301,7 @@
String jsonString = "";
try {
// 灏咼ava瀵硅薄杞崲涓篔SON瀛楃涓�
- request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
+// request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
jsonString = objectMapper.writeValueAsString(request);
System.out.println(jsonString);
} catch (Exception e) {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
index cb464c1..f0d3d03 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
@@ -1,5 +1,6 @@
package org.dromara.system.uitil;
+import cn.hutool.json.JSON;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.PostMethod;
@@ -18,6 +19,8 @@
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
public class HttpUtils {
@@ -124,6 +127,7 @@
org.apache.http.client.HttpClient httpClient = HttpClientBuilder.create().build();
HttpPost httpPost = new HttpPost(url);
+ ContentType contentType = ContentType.create("multipart/form-data", StandardCharsets.UTF_8);
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
@@ -135,6 +139,8 @@
builder.addTextBody("ossId", entity.getOssId(), ContentType.TEXT_PLAIN);
builder.addTextBody("createBy", entity.getCreateBy(), ContentType.TEXT_PLAIN);
builder.addTextBody("password", entity.getPassword(), ContentType.TEXT_PLAIN);
+ builder.addTextBody("fileName", entity.getFileName(),contentType);
+// builder.addTextBody("createTime", entity.getCreateTime(),);
HttpEntity multipart = builder.build();
httpPost.setEntity(multipart);
--
Gitblit v1.8.0