From bf871e3e73b048d1368ff7cc77ac720905c91167 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期五, 19 十二月 2025 13:49:41 +0800
Subject: [PATCH] 整合钉钉和企业微信
---
src/test/java/com/gs/dingtalk/DeviceReceivingApplicationTests.java | 30 +++++++-------
src/main/java/com/gs/dingtalk/config/DataAcquisitionConfiguration.java | 19 ---------
src/main/java/com/gs/dingtalk/service/SimpleExample.java | 34 ++++++++--------
3 files changed, 32 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/gs/dingtalk/config/DataAcquisitionConfiguration.java b/src/main/java/com/gs/dingtalk/config/DataAcquisitionConfiguration.java
index e482c06..4813358 100644
--- a/src/main/java/com/gs/dingtalk/config/DataAcquisitionConfiguration.java
+++ b/src/main/java/com/gs/dingtalk/config/DataAcquisitionConfiguration.java
@@ -3,25 +3,6 @@
public class DataAcquisitionConfiguration {
- //娴嬭瘯鐜
- public static final String TEST_COMPANY_CODE = "55958795";
-
- public static final String TEST_APP_KEY = "ab2d86b6dffabcc81dca6855c727c246";
-
- public static final String TEST_APP_SECRET = "01b17babe2a96d5ebd802e67709f33d1";
-
- public static final String TEST_ERP_CODE = "Z106";
-
- //姝ｅ紡鐜
- public static final String COMPANY_CODE = "72505985";
-
- public static final String APP_KEY = "a2866f03bb7f76387bfb1a98001f0e31";
-
- public static final String APP_SECRET = "f13bd1bcb130f0090ed92dc021e5f4e1";
-
- public static final String ERP_CODE = "Z106";
-
-
/**
* 搴旂敤鐨� AgentId
*/
diff --git a/src/main/java/com/gs/dingtalk/service/SimpleExample.java b/src/main/java/com/gs/dingtalk/service/SimpleExample.java
index e1fea38..0c74099 100644
--- a/src/main/java/com/gs/dingtalk/service/SimpleExample.java
+++ b/src/main/java/com/gs/dingtalk/service/SimpleExample.java
@@ -61,7 +61,7 @@
try {
Long timestamp = System.currentTimeMillis();
System.out.println(timestamp);
- String secret = DataAcquisitionConfiguration.SECRET;
+ String secret = DataAcquisitionConfiguration.TALK_APP_SECRET;
String stringToSign = timestamp + "\n" + secret;
Mac mac = Mac.getInstance("HmacSHA256");
mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
@@ -164,8 +164,8 @@
public String getAccessToken() throws Exception {
Client client = createClient();
GetAccessTokenRequest getAccessTokenRequest = new GetAccessTokenRequest()
- .setAppKey(DataAcquisitionConfiguration.APP_KEY)
- .setAppSecret(DataAcquisitionConfiguration.APP_SECRET);
+ .setAppKey(DataAcquisitionConfiguration.TALK_APP_KEY)
+ .setAppSecret(DataAcquisitionConfiguration.TALK_APP_SECRET);
try {
GetAccessTokenResponse accessToken = client.getAccessToken(getAccessTokenRequest);
return accessToken.body.getAccessToken();
@@ -208,20 +208,20 @@
}
- public OapiV2UserGetbymobileResponse getOapiV2UserGetbymobileResponse(SendDingtalk s, String accessToken) {
- DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getbymobile");
- OapiV2UserGetbymobileRequest req = new OapiV2UserGetbymobileRequest();
- req.setMobile(s.getTelephone());
- req.setSupportExclusiveAccountSearch(true);
- OapiV2UserGetbymobileResponse rsp = null;
-
- try {
- rsp = client.execute(req, accessToken);
- } catch (ApiException e) {
- throw new RuntimeException(e);
- }
- return rsp;
- }
+ // public OapiV2UserGetbymobileResponse getOapiV2UserGetbymobileResponse(SendDingtalk s, String accessToken) {
+// DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getbymobile");
+// OapiV2UserGetbymobileRequest req = new OapiV2UserGetbymobileRequest();
+// req.setMobile(s.getTelephone());
+// req.setSupportExclusiveAccountSearch(true);
+// OapiV2UserGetbymobileResponse rsp = null;
+//
+// try {
+// rsp = client.execute(req, accessToken);
+// } catch (ApiException e) {
+// throw new RuntimeException(e);
+// }
+// return rsp;
+// }
public OapiV2UserGetbymobileResponse getOapiV2UserGetbymobileResponse(String mobile, String accessToken) {
DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getbymobile");
diff --git a/src/test/java/com/gs/dingtalk/DeviceReceivingApplicationTests.java b/src/test/java/com/gs/dingtalk/DeviceReceivingApplicationTests.java
index a54334c..1167cfe 100644
--- a/src/test/java/com/gs/dingtalk/DeviceReceivingApplicationTests.java
+++ b/src/test/java/com/gs/dingtalk/DeviceReceivingApplicationTests.java
@@ -33,21 +33,21 @@
void testExportAndSendProductionData() throws Exception {
System.out.println("=== 寮�濮嬫祴璇曞鍑虹敓浜ф暟鎹苟鍙戦�侀拤閽� ===");
-// try {
-// boolean result = vwCjScSjTsBbService.exportAndSendToDingtalk();
-//
-// if (result) {
-// System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭骞跺彂閫佹垚鍔�");
-// System.out.println(" - 鏁版嵁宸蹭粠 VW_CJ_SC_SJ_TS_BB 琛ㄦ煡璇�");
-// System.out.println(" - Excel 鏂囦欢宸茬敓鎴愬苟淇濆瓨鍒� D:\\BIFile\\");
-// System.out.println(" - 閽夐拤鏂囦欢娑堟伅宸插彂閫�");
-// } else {
-// System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭鎴栧彂閫佸け璐�");
-// }
-// } catch (Exception e) {
-// System.out.println("鉁� 瀵煎嚭骞跺彂閫佹椂鍙戠敓寮傚父: " + e.getMessage());
-// e.printStackTrace();
-// }
+ try {
+ boolean result = vwCjScSjTsBbService.exportAndSendToDingtalk();
+
+ if (result) {
+ System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭骞跺彂閫佹垚鍔�");
+ System.out.println(" - 鏁版嵁宸蹭粠 VW_CJ_SC_SJ_TS_BB 琛ㄦ煡璇�");
+ System.out.println(" - Excel 鏂囦欢宸茬敓鎴愬苟淇濆瓨鍒� D:\\BIFile\\");
+ System.out.println(" - 閽夐拤鏂囦欢娑堟伅宸插彂閫�");
+ } else {
+ System.out.println("鉁� 鐢熶骇鏁版嵁瀵煎嚭鎴栧彂閫佸け璐�");
+ }
+ } catch (Exception e) {
+ System.out.println("鉁� 瀵煎嚭骞跺彂閫佹椂鍙戠敓寮傚父: " + e.getMessage());
+ e.printStackTrace();
+ }
System.out.println("=== 娴嬭瘯缁撴潫 ===");
}
--
Gitblit v1.9.3