diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml index 76a28752..56f92d1e 100644 --- a/powerjob-client/pom.xml +++ b/powerjob-client/pom.xml @@ -14,16 +14,33 @@ jar - 3.3.0 5.6.1 + 1.2.68 + 3.3.0 + + 3.2.4 + + + + com.alibaba + fastjson + ${fastjson.version} + + com.github.kfcfans powerjob-common ${powerjob.common.version} + + + com.typesafe.akka + * + + @@ -35,4 +52,47 @@ + + + + org.apache.maven.plugins + maven-shade-plugin + ${mvn.shade.plugin.version} + + false + + + okhttp3 + shade.powerjob.okhttp3 + + + okio + shade.powerjob.okio + + + com.google + shade.powerjob.com.google + + + org.apache + shade.powerjob.org.apache + + + com.alibaba + shade.powerjob.com.alibaba + + + + + + package + + shade + + + + + + + \ No newline at end of file diff --git a/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java b/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java index a2f91a13..cadeb661 100644 --- a/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java +++ b/powerjob-client/src/main/java/com/github/kfcfans/powerjob/client/OhMyClient.java @@ -1,5 +1,6 @@ package com.github.kfcfans.powerjob.client; +import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.InstanceStatus; import com.github.kfcfans.powerjob.common.PowerJobException; import com.github.kfcfans.powerjob.common.OpenAPIConstant; @@ -8,7 +9,6 @@ import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; import com.github.kfcfans.powerjob.common.response.*; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import com.github.kfcfans.powerjob.common.utils.HttpUtils; -import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import okhttp3.FormBody; @@ -62,7 +62,7 @@ public class OhMyClient { try { String result = assertApp(appName, password, url); if (StringUtils.isNotEmpty(result)) { - ResultDTO resultDTO = JsonUtils.parseObject(result, ResultDTO.class); + ResultDTO resultDTO = JSONObject.parseObject(result, ResultDTO.class); if (resultDTO.isSuccess()) { appId = Long.parseLong(resultDTO.getData().toString()); currentAddress = addr; @@ -107,9 +107,9 @@ public class OhMyClient { request.setAppId(appId); MediaType jsonType = MediaType.parse("application/json; charset=utf-8"); - String json = JsonUtils.toJSONStringUnsafe(request); + String json = JSONObject.toJSONString(request); String post = postHA(OpenAPIConstant.SAVE_JOB, RequestBody.create(jsonType, json)); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -124,7 +124,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.FETCH_JOB, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -139,7 +139,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.DISABLE_JOB, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -154,7 +154,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.ENABLE_JOB, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -169,7 +169,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.DELETE_JOB, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -190,7 +190,7 @@ public class OhMyClient { builder.add("instanceParams", instanceParams); } String post = postHA(OpenAPIConstant.RUN_JOB, builder.build()); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } public ResultDTO runJob(Long jobId) throws Exception { return runJob(jobId, null, 0); @@ -209,7 +209,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.STOP_INSTANCE, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -225,7 +225,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.CANCEL_INSTANCE, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -241,7 +241,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.RETRY_INSTANCE, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -255,7 +255,7 @@ public class OhMyClient { .add("instanceId", instanceId.toString()) .build(); String post = postHA(OpenAPIConstant.FETCH_INSTANCE_STATUS, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -269,7 +269,7 @@ public class OhMyClient { .add("instanceId", instanceId.toString()) .build(); String post = postHA(OpenAPIConstant.FETCH_INSTANCE_INFO, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /* ************* Workflow 区 ************* */ @@ -282,9 +282,9 @@ public class OhMyClient { public ResultDTO saveWorkflow(SaveWorkflowRequest request) throws Exception { request.setAppId(appId); MediaType jsonType = MediaType.parse("application/json; charset=utf-8"); - String json = JsonUtils.toJSONStringUnsafe(request); + String json = JSONObject.toJSONString(request); String post = postHA(OpenAPIConstant.SAVE_WORKFLOW, RequestBody.create(jsonType, json)); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -299,7 +299,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.FETCH_WORKFLOW, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -314,7 +314,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.DISABLE_WORKFLOW, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -329,7 +329,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.ENABLE_WORKFLOW, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -344,7 +344,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.DELETE_WORKFLOW, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -364,7 +364,7 @@ public class OhMyClient { builder.add("initParams", initParams); } String post = postHA(OpenAPIConstant.RUN_WORKFLOW, builder.build()); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } public ResultDTO runWorkflow(Long workflowId) throws Exception { return runWorkflow(workflowId, null, 0); @@ -383,7 +383,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.STOP_WORKFLOW_INSTANCE, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } /** @@ -398,7 +398,7 @@ public class OhMyClient { .add("appId", appId.toString()) .build(); String post = postHA(OpenAPIConstant.FETCH_WORKFLOW_INSTANCE_INFO, body); - return JsonUtils.parseObject(post, ResultDTO.class); + return JSONObject.parseObject(post, ResultDTO.class); } diff --git a/powerjob-client/src/test/java/TestClient.java b/powerjob-client/src/test/java/TestClient.java index 5cebd7ac..dd469c99 100644 --- a/powerjob-client/src/test/java/TestClient.java +++ b/powerjob-client/src/test/java/TestClient.java @@ -1,3 +1,4 @@ +import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.common.ExecuteType; import com.github.kfcfans.powerjob.common.ProcessorType; import com.github.kfcfans.powerjob.common.TimeExpressionType; @@ -5,7 +6,6 @@ import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; import com.github.kfcfans.powerjob.common.response.JobInfoDTO; import com.github.kfcfans.powerjob.common.response.ResultDTO; import com.github.kfcfans.powerjob.client.OhMyClient; -import com.github.kfcfans.powerjob.common.utils.JsonUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -46,13 +46,13 @@ public class TestClient { newJobInfo.setMinDiskSpace(1.3); ResultDTO resultDTO = ohMyClient.saveJob(newJobInfo); - System.out.println(JsonUtils.toJSONString(resultDTO)); + System.out.println(JSONObject.toJSONString(resultDTO)); } @Test public void testFetchJob() throws Exception { ResultDTO fetchJob = ohMyClient.fetchJob(1L); - System.out.println(JsonUtils.toJSONStringUnsafe(fetchJob)); + System.out.println(JSONObject.toJSONString(fetchJob)); } @Test @@ -93,21 +93,21 @@ public class TestClient { @Test public void testCancelInstanceInTimeWheel() throws Exception { ResultDTO startRes = ohMyClient.runJob(15L, "start by OhMyClient", 20000); - System.out.println("runJob result: " + JsonUtils.toJSONString(startRes)); + System.out.println("runJob result: " + JSONObject.toJSONString(startRes)); ResultDTO cancelRes = ohMyClient.cancelInstance(startRes.getData()); - System.out.println("cancelJob result: " + JsonUtils.toJSONString(cancelRes)); + System.out.println("cancelJob result: " + JSONObject.toJSONString(cancelRes)); } @Test public void testCancelInstanceInDatabase() throws Exception { ResultDTO startRes = ohMyClient.runJob(15L, "start by OhMyClient", 2000000); - System.out.println("runJob result: " + JsonUtils.toJSONString(startRes)); + System.out.println("runJob result: " + JSONObject.toJSONString(startRes)); // 手动重启 server，干掉时间轮中的调度数据 TimeUnit.MINUTES.sleep(1); ResultDTO cancelRes = ohMyClient.cancelInstance(startRes.getData()); - System.out.println("cancelJob result: " + JsonUtils.toJSONString(cancelRes)); + System.out.println("cancelJob result: " + JSONObject.toJSONString(cancelRes)); } @Test diff --git a/powerjob-client/src/test/java/TestWorkflow.java b/powerjob-client/src/test/java/TestWorkflow.java index 0e888742..9e04d80e 100644 --- a/powerjob-client/src/test/java/TestWorkflow.java +++ b/powerjob-client/src/test/java/TestWorkflow.java @@ -1,3 +1,4 @@ +import com.alibaba.fastjson.JSONObject; import com.github.kfcfans.powerjob.client.OhMyClient; import com.github.kfcfans.powerjob.common.ExecuteType; import com.github.kfcfans.powerjob.common.ProcessorType; @@ -5,7 +6,6 @@ import com.github.kfcfans.powerjob.common.TimeExpressionType; import com.github.kfcfans.powerjob.common.model.PEWorkflowDAG; import com.github.kfcfans.powerjob.common.request.http.SaveJobInfoRequest; import com.github.kfcfans.powerjob.common.request.http.SaveWorkflowRequest; -import com.github.kfcfans.powerjob.common.utils.JsonUtils; import com.google.common.collect.Lists; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ public class TestWorkflow { base.setProcessorInfo("com.github.kfcfans.powerjob.samples.workflow.WorkflowStandaloneProcessor"); for (int i = 0; i < 5; i++) { - SaveJobInfoRequest request = JsonUtils.parseObject(JsonUtils.toBytes(base), SaveJobInfoRequest.class); + SaveJobInfoRequest request = JSONObject.parseObject(JSONObject.toJSONBytes(base), SaveJobInfoRequest.class); request.setJobName(request.getJobName() + i); System.out.println(ohMyClient.saveJob(request)); }