From 8ca64d03d58db959d95f49119be0cb322d6edf2f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 17:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index d679d2a..3563248 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -28,6 +28,7 @@
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.springblade.common.utils.arg;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.oss.model.OssFile;
@@ -224,23 +225,10 @@
attach.setDeptid(deptid);
attach.setType(type);
attachService.save(attach);
- test01("http://192.168.0.104:80/blade-resource/attach/save",attach);
+ arg.test01(arg.url+"/blade-resource/attach/save",attach);
return attach.getId();
}
- public static String test01(String path,Object obj) throws Exception{
- CloseableHttpClient httpClient = HttpClients.createDefault();
- HttpPost httpPost = new HttpPost(path);
- httpPost.setEntity(new StringEntity(JSON.toJSONString(obj),
- ContentType.create("application/json", "UTF-8")));
- CloseableHttpResponse execute = httpClient.execute(httpPost);
- HttpEntity entity = execute.getEntity();
- String str = EntityUtils.toString(entity);
- httpPost.clone();
- httpClient.close();
- System.out.println(str);
- return str;
- }
/**
* 删除文件
*
--
Gitblit v1.9.3