From 8446d9171593c574ff12db73cf7e044249ff734f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=A0=8B?= <lidong@21tb.com>
Date: Tue, 1 Nov 2022 15:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/job/WorkflowSyncCronJob.java   |  8 +++
 .../interfaces/job/util/HttpRequestUtil.java  | 51 +++++++++++++++++++
 src/weaver/interfaces/util/HttpUtils.java     |  5 +-
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/weaver/interfaces/job/util/HttpRequestUtil.java

diff --git a/src/weaver/interfaces/job/WorkflowSyncCronJob.java b/src/weaver/interfaces/job/WorkflowSyncCronJob.java
index bfef7de9..0f5734ba 100644
--- a/src/weaver/interfaces/job/WorkflowSyncCronJob.java
+++ b/src/weaver/interfaces/job/WorkflowSyncCronJob.java
@@ -224,6 +224,14 @@ public class WorkflowSyncCronJob extends BaseCronJob {
     private void writeTimeNode(String timeNodeTable, String currentTime, String syncType, String timeNodeUse, String formmodeid) throws Exception {
         RecordSet recordSet = new RecordSet();
         String sql = "SET IDENTITY_INSERT " + timeNodeTable + " ON insert into " + timeNodeTable + " (id,formmodeid,type,timenode,useto) values (?,?,?,?,?)";
+        String dbType = recordSet.getDBType();
+        if ("mysql".equalsIgnoreCase(dbType)) {
+            sql = "insert into " + timeNodeTable + " (id,formmodeid,type,timenode,useto) values (?,?,?,?,?)";
+        } else if ("oracle".equalsIgnoreCase(dbType)) {
+            sql = "insert into " + timeNodeTable + " (id,formmodeid,type,timenode,useto) values (?,?,?,?,?)";
+        } else if ("sqlserver".equalsIgnoreCase(dbType)) {
+            sql = "SET IDENTITY_INSERT " + timeNodeTable + " ON insert into " + timeNodeTable + " (id,formmodeid,type,timenode,useto) values (?,?,?,?,?)";
+        }
         recordSet.executeUpdate(sql, IdGenerator.getNextId(timeNodeTable), formmodeid, syncType, currentTime, timeNodeUse);
     }
 }
diff --git a/src/weaver/interfaces/job/util/HttpRequestUtil.java b/src/weaver/interfaces/job/util/HttpRequestUtil.java
new file mode 100644
index 00000000..d97c4c99
--- /dev/null
+++ b/src/weaver/interfaces/job/util/HttpRequestUtil.java
@@ -0,0 +1,51 @@
+package weaver.interfaces.job.util;
+
+import com.sun.jersey.core.util.Base64;
+import okhttp3.*;
+import weaver.general.BaseBean;
+
+import java.io.IOException;
+
+public class HttpRequestUtil extends BaseBean{
+
+	/***
+	 *
+	 * @param dataJson
+	 * @return
+	 */
+	public static String doPostByAuth(String portal_todourl,String dataJson,String auth){
+		//"http://172.16.25.133/portal-web/centerTodo/sync"
+		BaseBean bb = new BaseBean();
+
+		String authorization = "Basic "+new String(Base64.encode(auth));
+		bb.writeLog("authorization:"+authorization);
+		bb.writeLog("portal_todourl:"+portal_todourl);
+		bb.writeLog("dataJson:"+dataJson);
+		bb.writeLog("auth:"+auth);
+
+		String msgData = "" ;
+		OkHttpClient client = new OkHttpClient().newBuilder().build();
+		MediaType mediaType = MediaType.parse("application/json");
+		RequestBody body = RequestBody.create(mediaType, dataJson);
+		Request request = new Request.Builder()
+				.url(portal_todourl)
+				.method("POST", body)
+				.addHeader("Authorization", authorization)
+				.addHeader("Content-Type", "application/json")
+				.build();
+		try {
+			Response response = client.newCall(request).execute();
+
+			bb.writeLog("response.code():"+response.code());
+			bb.writeLog("response.body():"+response.body().string());
+
+			if(response!=null && response.code() == 200){
+				msgData = response.body().string();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return msgData;
+	}
+
+}
diff --git a/src/weaver/interfaces/util/HttpUtils.java b/src/weaver/interfaces/util/HttpUtils.java
index 3f99659d..ec83fb81 100644
--- a/src/weaver/interfaces/util/HttpUtils.java
+++ b/src/weaver/interfaces/util/HttpUtils.java
@@ -24,7 +24,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-@Slf4j
+
+/**
+ * @author Lee
+ */
 public class HttpUtils {
 
     public static String doPost(String url) {