diff --git a/TestWordToPDF/.classpath b/TestWordToPDF/.classpath
index 3776f7d..718d75b 100644
--- a/TestWordToPDF/.classpath
+++ b/TestWordToPDF/.classpath
@@ -3,5 +3,6 @@
+
diff --git a/TestWordToPDF/bin/com/connor/uploadfile/MinioUtil.class b/TestWordToPDF/bin/com/connor/uploadfile/MinioUtil.class
index 5ff7ff6..9830867 100644
Binary files a/TestWordToPDF/bin/com/connor/uploadfile/MinioUtil.class and b/TestWordToPDF/bin/com/connor/uploadfile/MinioUtil.class differ
diff --git a/TestWordToPDF/bin/com/connor/uploadfile/UploadFile.class b/TestWordToPDF/bin/com/connor/uploadfile/UploadFile.class
index 7440589..880eafa 100644
Binary files a/TestWordToPDF/bin/com/connor/uploadfile/UploadFile.class and b/TestWordToPDF/bin/com/connor/uploadfile/UploadFile.class differ
diff --git a/TestWordToPDF/lib/json-org.jar b/TestWordToPDF/lib/json-org.jar
new file mode 100644
index 0000000..21e09db
Binary files /dev/null and b/TestWordToPDF/lib/json-org.jar differ
diff --git a/TestWordToPDF/src/com/connor/uploadfile/MinioUtil.java b/TestWordToPDF/src/com/connor/uploadfile/MinioUtil.java
index 71787c1..12a7246 100644
--- a/TestWordToPDF/src/com/connor/uploadfile/MinioUtil.java
+++ b/TestWordToPDF/src/com/connor/uploadfile/MinioUtil.java
@@ -4,11 +4,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
-import io.minio.GetPresignedObjectUrlArgs;
import io.minio.MinioClient;
-import io.minio.ObjectWriteResponse;
import io.minio.PutObjectArgs;
-import io.minio.http.Method;
public class MinioUtil {
private static final String ENDPOINT = "http://10.128.11.20:9000";
diff --git a/TestWordToPDF/src/com/connor/uploadfile/UploadFile.java b/TestWordToPDF/src/com/connor/uploadfile/UploadFile.java
index 997b193..2f5260d 100644
--- a/TestWordToPDF/src/com/connor/uploadfile/UploadFile.java
+++ b/TestWordToPDF/src/com/connor/uploadfile/UploadFile.java
@@ -1,39 +1,102 @@
package com.connor.uploadfile;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import org.checkerframework.common.returnsreceiver.qual.This;
+import org.json.JSONObject;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.MinioClient;
-import io.minio.ObjectWriteResponse;
-import io.minio.PutObjectArgs;
import io.minio.UploadObjectArgs;
import io.minio.http.Method;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
public class UploadFile {
+ @SuppressWarnings("deprecation")
public static void main(String args[]) {
String filePath = args[0];//"D:\\1.txt";//
// InputStream in = null;
try {
- File file = new File(filePath);
- String sendFileToMinio = sendFileToMinio(file, "SapBomLog/" + file.getName());
- System.out.println(sendFileToMinio);
+ if(filePath.equals("FS")) {
+// System.out.println("args[1]：" + args[1]);
+ /*OkHttpClient client = new OkHttpClient();
+ MediaType mediaType = MediaType.parse("application/json");
+ @SuppressWarnings("deprecation")
+ RequestBody body = RequestBody.create(mediaType, args[1]);
+ Request request =
+ new Request.Builder()
+ .url("http://10.128.10.170/api/feishu/Message/sendMessages")
+ .method("POST", body)
+ .addHeader("Content-Type", "application/json")
+ .build();
+ Response response = client.newCall(request).execute();
+ System.out.println(response.body().string());*/
+
+ //TODO lidy20240828新接口 先获取token，再组织数据
+ OkHttpClient client = new OkHttpClient();
+ RequestBody body = RequestBody.create(null, new byte[0]);
+ Request request = new Request.Builder()
+ .url("https://pub.chintelec.com/api/getToken?appId=zt_plm&appSecret=RA5KfdZtj37zpVsmgKeSxWncEIT8npVf")
+ .post(body)
+// .addHeader("User-Agent", "PostmanRuntime/7.15.2")
+// .addHeader("Accept", "*/*")
+// .addHeader("Cache-Control", "no-cache")
+// .addHeader("Postman-Token", "a9295d9a-e069-4098-bc7b-af6ad2f37f8a,48f24111-1460-4588-8c1d-ad4f6d809d94")
+// .addHeader("Host", "pub.chintelec.com")
+// .addHeader("Accept-Encoding", "gzip, deflate")
+// .addHeader("Content-Length", "")
+// .addHeader("Connection", "keep-alive")
+// .addHeader("cache-control", "no-cache")
+ .build();
+ Response response = client.newCall(request).execute();
+ String res = response.body().string();
+ JSONObject jsonObject = new JSONObject(res);
+// System.out.println(res);
+ if(!jsonObject.getBoolean("success")) {
+ System.out.println(res);
+ return;
+ }
+ String token = jsonObject.getString("data");
+
+ client = new OkHttpClient();
+ MediaType mediaType = MediaType.parse("application/json");
+ String json = args[1].replaceAll(",\"admin\"", "").replaceAll("\"admin\",", "").replaceAll("\"admin\"", "");
+ body = RequestBody.create(mediaType, json);
+ request = new Request.Builder()
+ .url("https://pub.chintelec.com/api/open/Feishu/sendMessages")
+ .post(body)
+ .addHeader("Authorization", token)
+ .addHeader("Content-Type", "application/json")
+// .addHeader("User-Agent", "PostmanRuntime/7.15.2")
+// .addHeader("Accept", "*/*")
+// .addHeader("Cache-Control", "no-cache")
+// .addHeader("Postman-Token", "26eae4d3-be83-4345-b5a2-b85c2f21c8a4,4183d845-8d4d-4e9f-9320-ec183098656e")
+// .addHeader("Host", "pub.chintelec.com")
+// .addHeader("Accept-Encoding", "gzip, deflate")
+// .addHeader("Content-Length", "142")
+// .addHeader("Connection", "keep-alive")
+// .addHeader("cache-control", "no-cache")
+ .build();
+ response = client.newCall(request).execute();
+ System.out.println(response.body().string());
+ }else {
+ File file = new File(filePath);
+ String sendFileToMinio = sendFileToMinio(file, "SapBomLog/" + file.getName());
+ System.out.println(sendFileToMinio);
+ }
} catch (Exception e) {
- // TODO Auto-generated catch block
+ // Auto-generated catch block
e.printStackTrace();
}
System.exit(0);
// System.out.println("11111");
// return;
}
- public static String sendFileToMinio(File file, String minioObj) throws Exception {
+ private static String sendFileToMinio(File file, String minioObj) throws Exception {
// InputStream in = new FileInputStream(file);
MinioClient client = MinioClient.builder().endpoint("http://10.128.11.20:9000")