From e7b9c77d81b35302fcf289aa897f6705dad18196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Fri, 10 Dec 2021 11:58:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/script/statistics/ApiUtil.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java index 746556da5..2a1947d87 100644 --- a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java +++ b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java @@ -29,8 +29,8 @@ import org.apache.http.impl.client.DefaultHttpClient; import com.alibaba.fastjson.JSONObject; /** - * èš‚èš�分工开放平å�°å·¥å…·ç±» - * 由于groovy调用会误报签å��错误问题,故用javaæ–¹å¼� + * ÂìÒÏ·Ö¹¤¿ª·Åƽ̨¹¤¾ßÀà + * ÓÉÓÚgroovyµ÷ÓûáÎó±¨Ç©Ãû´íÎóÎÊÌ⣬¹ÊÓÃjava·½Ê½ */ public class ApiUtil { @@ -43,18 +43,18 @@ public class ApiUtil { } /** - * 获å�–ç­¾å�� + * »ñȡǩÃû */ public static String getApiSingnature(JSONObject body, Long timeStamp, String secretKey) throws Exception { String signature = ""; try { - //å�‚数排åº�,ä¿�è¯�ç­¾å��一致 + //²ÎÊýÅÅÐò£¬±£Ö¤Ç©ÃûÒ»Ö List fileds = new ArrayList<>(); Set> set = body.entrySet(); for (Entry entry : set) { fileds.add(entry.getKey()); } - //å�‚数执行排åº� + //²ÎÊýÖ´ÐÐÅÅÐò Collections.sort(fileds); Map params = new LinkedHashMap(); for (String key : fileds) { @@ -71,7 +71,7 @@ public class ApiUtil { return signature; } catch (Exception e) { e.printStackTrace(); - throw new Exception("计算签å��错误"); + throw new Exception("¼ÆËãÇ©Ãû´íÎó"); } } @@ -90,10 +90,10 @@ public class ApiUtil { StringEntity s = new StringEntity(json.toJSONString(), "utf-8"); post.setEntity(s); - // å�‘é€�请求 + // ·¢ËÍÇëÇó HttpResponse httpResponse = client.execute(post); - // 获å�–å“�应输入æµ� + // »ñÈ¡ÏìÓ¦ÊäÈëÁ÷ InputStream inStream = httpResponse.getEntity().getContent(); BufferedReader reader = new BufferedReader(new InputStreamReader(inStream, "utf-8")); StringBuilder strber = new StringBuilder(); @@ -110,12 +110,12 @@ public class ApiUtil { } } catch (Exception e) { e.printStackTrace(); - throw new RuntimeException("请求异常"); + throw new RuntimeException("ÇëÇóÒì³£"); } } /** - * 获å�–项目标签 + * »ñÈ¡ÏîÄ¿±êÇ© * * @return */ @@ -145,7 +145,7 @@ public class ApiUtil { } /** - * 获å�–项目列表 + * »ñÈ¡ÏîÄ¿Áбí * @return */ public static List listProject() { @@ -177,7 +177,7 @@ public class ApiUtil { } /** - * 获å�–项目下任务清å�•列表 + * »ñÈ¡ÏîÄ¿ÏÂÈÎÎñÇåµ¥Áбí * * @return */ @@ -206,7 +206,7 @@ public class ApiUtil { /** - * 获å�–项目下任务类型列表 + * »ñÈ¡ÏîÄ¿ÏÂÈÎÎñÀàÐÍÁбí * @return */ public static JSONObject listTaskType(String projectId) { @@ -233,7 +233,7 @@ public class ApiUtil { } /** - * 获å�–项目内任务列表 + * »ñÈ¡ÏîÄ¿ÄÚÈÎÎñÁбí * * @return */ @@ -269,7 +269,7 @@ public class ApiUtil { } /** - * 获å�–人员任务列表 + * »ñÈ¡ÈËÔ±ÈÎÎñÁбí */ public static List listTaskByPerson(String userid, String startTime, String endTime, int limitStart, int limitNum) { List tasks = null; @@ -299,9 +299,9 @@ public class ApiUtil { tasks = jsonArray.toJavaList(Task.class); } } else if (code == 90001){ - throw new RuntimeException("æ¯�个ä¼�业调用å�•个接å�£çš„频率ä¸�å�¯è¶…过60次/分钟,会返回错误ç �90001:listTaskByPerson"); + throw new RuntimeException("ÿ¸öÆóÒµµ÷Óõ¥¸ö½Ó¿ÚµÄƵÂʲ»¿É³¬¹ý60´Î/·ÖÖÓ£¬»á·µ»Ø´íÎóÂë90001:listTaskByPerson"); } else if (code == 90009) { - throw new RuntimeException("æ¯�个ä¼�业å�•个接å�£æ¯�天的最大上é™�为1000次,若超出会返回错误ç �90009:listTaskByPerson"); + throw new RuntimeException("ÿ¸öÆóÒµµ¥¸ö½Ó¿ÚÿÌìµÄ×î´óÉÏÏÞΪ1000´Î£¬Èô³¬³ö»á·µ»Ø´íÎóÂë90009:listTaskByPerson"); } } catch (Exception ex) { ex.printStackTrace(); @@ -310,13 +310,13 @@ public class ApiUtil { } /** - * 获å�–人员任务列表 + * »ñÈ¡ÈËÔ±ÈÎÎñÁбí */ public static List listTaskByPerson(String startTime, String endTime, int limitStart, int limitNum) { return listTaskByPerson(null, startTime, endTime, limitStart, limitNum); } /** - * 获å�–任务详情 + * »ñÈ¡ÈÎÎñÏêÇé * * @return */ @@ -342,9 +342,9 @@ public class ApiUtil { } else if (code == 90001){ Thread.sleep(1000 * 60); return getTaskDetail(taskId); - //throw new RuntimeException("æ¯�个ä¼�业调用å�•个接å�£çš„频率ä¸�å�¯è¶…过60次/分钟,会返回错误ç �90001:getTaskDetail"); + //throw new RuntimeException("ÿ¸öÆóÒµµ÷Óõ¥¸ö½Ó¿ÚµÄƵÂʲ»¿É³¬¹ý60´Î/·ÖÖÓ£¬»á·µ»Ø´íÎóÂë90001:getTaskDetail"); } else if (code == 90009) { - throw new RuntimeException("æ¯�个ä¼�业å�•个接å�£æ¯�天的最大上é™�为1000次,若超出会返回错误ç �90009:getTaskDetail"); + throw new RuntimeException("ÿ¸öÆóÒµµ¥¸ö½Ó¿ÚÿÌìµÄ×î´óÉÏÏÞΪ1000´Î£¬Èô³¬³ö»á·µ»Ø´íÎóÂë90009:getTaskDetail"); } } catch (Exception e) { //e.printStackTrace(); @@ -371,7 +371,7 @@ public class ApiUtil { // } // } // for (Task task : tasks) { -// if ("穆良书".equals(task.getResponse().getName())) { +// if ("ÄÂÁ¼Êé".equals(task.getResponse().getName())) { // System.out.println(task); // } // } From 46766341dceefc9dedca0b59cc96663fbe4f5ee6 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 10 Dec 2021 12:01:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fangjia/script/statistics/ApiUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java index 2a1947d87..129465804 100644 --- a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java +++ b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java @@ -30,7 +30,7 @@ import com.alibaba.fastjson.JSONObject; /** * ÂìÒÏ·Ö¹¤¿ª·Åƽ̨¹¤¾ßÀà - * ÓÉÓÚgroovyµ÷ÓûáÎó±¨Ç©Ãû´íÎóÎÊÌ⣬¹ÊÓÃjava·½Ê½ + * ÓÉÓÚgroovyµ÷ÓûáÎó±¨Ç©Ãû´íÎóÎÊÌ⣬¹ÊÓà java ·½Ê½ */ public class ApiUtil {