Bladeren bron

Restore original runtime configuration

zhangkan 3 weken geleden
bovenliggende
commit
ac0813f086

+ 0 - 15
src/main/java/com/muzhi/baiqueling/common/EnvironmentVariables.java

@@ -1,15 +0,0 @@
-package com.muzhi.baiqueling.common;
-
-public final class EnvironmentVariables {
-
-    private EnvironmentVariables() {
-    }
-
-    public static String require(String name) {
-        String value = System.getenv(name);
-        if (value == null || value.trim().isEmpty()) {
-            throw new IllegalStateException("Required environment variable is not set: " + name);
-        }
-        return value;
-    }
-}

+ 27 - 12
src/main/java/com/muzhi/baiqueling/service/impl/AccessTokenServiceImpl.java

@@ -6,7 +6,6 @@ import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.request.OapiGettokenRequest;
 import com.dingtalk.api.response.OapiGettokenResponse;
 import com.google.common.collect.Maps;
-import com.muzhi.baiqueling.common.EnvironmentVariables;
 import com.muzhi.baiqueling.service.AccessTokenService;
 import com.taobao.api.ApiException;
 import okhttp3.*;
@@ -26,6 +25,14 @@ import java.util.Map;
 @Service
 public class AccessTokenServiceImpl implements AccessTokenService {
 
+    /**钉钉应用_云璞POC*/
+    //APPKEY
+    private static String APPKEY_YunpuPOC = "ding8qyulwwmad6j7k6c";
+    //APPSECRET
+    private static String APPSECRET_YunpuPOC = "e_hRHuubw-Xi0OuPJOYdXSElVzOC0IPgMrHQTBuAM9BqW-DFnrcsSyBHi7Me3xSv";
+    //AgenthId:1963716187
+    //corpId:
+
     public static String DingtalkAccessToken_YunpuPOC = null;
 
     //获取dingtalk授权码(钉钉应用)
@@ -33,8 +40,8 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     public String getAccessToken_YunpuPOC() {
         DefaultDingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/gettoken");
         OapiGettokenRequest request = new OapiGettokenRequest();
-        request.setAppkey(EnvironmentVariables.require("DINGTALK_YUNPU_APP_KEY"));
-        request.setAppsecret(EnvironmentVariables.require("DINGTALK_YUNPU_APP_SECRET"));
+        request.setAppkey(APPKEY_YunpuPOC);
+        request.setAppsecret(APPSECRET_YunpuPOC);
         request.setHttpMethod("GET");
         try {
             OapiGettokenResponse response = client.execute(request);
@@ -45,6 +52,14 @@ public class AccessTokenServiceImpl implements AccessTokenService {
         return DingtalkAccessToken_YunpuPOC;
     }
 
+    /**钉钉应用*/
+    //APPKEY
+    private static String APPKEY = "dingd93y9mnocx0byxbu";
+    //APPSECRET
+    private static String APPSECRET = "W04eACqPupjyEGKuYuGo_Z0fRjdLKL034Sb-gDogoE4QQVFK725SBUFnwcXE6FfQ";
+    //AgenthId:3153704771
+    //corpId:
+
     public static String DingtalkAccessToken = null;
 
     //获取dingtalk授权码(钉钉应用)
@@ -52,8 +67,8 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     public String getAccessToken() {
         DefaultDingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/gettoken");
         OapiGettokenRequest request = new OapiGettokenRequest();
-        request.setAppkey(EnvironmentVariables.require("DINGTALK_APP_KEY"));
-        request.setAppsecret(EnvironmentVariables.require("DINGTALK_APP_SECRET"));
+        request.setAppkey(APPKEY);
+        request.setAppsecret(APPSECRET);
         request.setHttpMethod("GET");
         try {
             OapiGettokenResponse response = client.execute(request);
@@ -75,8 +90,8 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     @Override
     public JSONObject getAccessToken_meike() {
         //appCode和appSecret请联系每刻工作人员
-        String appCode = EnvironmentVariables.require("MAYCUR_APP_CODE");
-        String appSecret = EnvironmentVariables.require("MAYCUR_APP_SECRET");
+        String appCode = "AP4PID3GWDJ391";
+        String appSecret = "wZ4iAHvF6e4edBv2uAqY1zCAYAx5ud1M";
 
         long timeMillis = System.currentTimeMillis();
         System.out.println("timeMillis:" + timeMillis);
@@ -97,7 +112,7 @@ public class AccessTokenServiceImpl implements AccessTokenService {
                 .url(HTTP_HOST +"/api/openapi/auth/login")
                 .method("POST", body)
                 .addHeader("Content-Type", "application/json")
-                .addHeader("Cookie", EnvironmentVariables.require("MAYCUR_COOKIE"))
+                .addHeader("Cookie", "acw_tc=3ccdc14717471251482292289e64b099ab9dc4d8fb4debb3229faf307c47f7")
                 .build();
         String code = "";
         String message = "";
@@ -139,10 +154,10 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     @Override
     public String getAccessToken_dms() {
         //密钥参数由DMS侧提供
-        String accountinfocode = EnvironmentVariables.require("DMS_ACCOUNT_INFO_CODE");
-        String opentypecode = EnvironmentVariables.require("DMS_OPEN_TYPE_CODE");
-        String opentypesecret = EnvironmentVariables.require("DMS_OPEN_TYPE_SECRET");
-        String clienttypecode = EnvironmentVariables.require("DMS_CLIENT_TYPE_CODE");
+        String accountinfocode = "1711679187993104384";
+        String opentypecode = "baiqueling-data-server";
+        String opentypesecret = "123456";
+        String clienttypecode = "1";
 
         Map map = new HashMap<>();
         map.put("accountinfocode", accountinfocode);

+ 1 - 2
src/main/java/com/muzhi/baiqueling/service/impl/DingTalkServiceImpl.java

@@ -13,7 +13,6 @@ import com.dingtalk.api.request.OapiSmartworkHrmEmployeeListRequest;
 import com.dingtalk.api.request.OapiSmartworkHrmEmployeeQueryonjobRequest;
 import com.dingtalk.api.response.OapiSmartworkHrmEmployeeListResponse;
 import com.dingtalk.api.response.OapiSmartworkHrmEmployeeQueryonjobResponse;
-import com.muzhi.baiqueling.common.EnvironmentVariables;
 import com.muzhi.baiqueling.service.AccessTokenService;
 import com.muzhi.baiqueling.service.DingTalkService;
 import com.muzhi.baiqueling.common.R;
@@ -408,7 +407,7 @@ public class DingTalkServiceImpl implements DingTalkService {
                     createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
                     com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest()
                             //应用秘钥
-                            .setSystemToken(EnvironmentVariables.require("YIDA_HR_SYSTEM_TOKEN"))
+                            .setSystemToken("PQ566991EFIPOV7V8QX0R4Q0MY8O3D3ID5E2M8F2")
                             //表单编码
                             .setFormUuid("FORM-CB66F375306C419BB1BB71837FB4BB65QOBT")
                             .setUserId("yida_pub_account")

+ 1 - 2
src/main/java/com/muzhi/baiqueling/service/impl/DmsServiceImpl.java

@@ -8,7 +8,6 @@ import com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceResponse;
 import com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataResponse;
 import com.aliyun.tea.TeaException;
 import com.aliyun.teautil.models.RuntimeOptions;
-import com.muzhi.baiqueling.common.EnvironmentVariables;
 import com.muzhi.baiqueling.common.R;
 import com.muzhi.baiqueling.service.AccessTokenService;
 import com.muzhi.baiqueling.service.DmsService;
@@ -341,7 +340,7 @@ public class DmsServiceImpl implements DmsService {
             createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest()
                     //应用秘钥
-                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+                    .setSystemToken("U4G66291B0Y4Z1LTIKH4QD5XHTNJ3YREYR6OMJ33")//云璞POC:XJ966GA126GX678XDP3AW5M8ZTSP39N7L5IDM85
                     //表单编码
                     .setFormUuid("FORM-349A5D1A8CBD4271BCEDBE94A60A7BCDOSXX")//云璞POC:FORM-64009DF27F5F479BBC82CD6C1768B5FAC0DY
                     .setUserId("yida_pub_account")

+ 5 - 13
src/main/java/com/muzhi/baiqueling/service/impl/MeikebaoxiaoServiceImpl.java

@@ -14,7 +14,6 @@ import com.dingtalk.api.request.OapiV2UserGetbymobileRequest;
 import com.dingtalk.api.response.OapiSmartworkHrmEmployeeV2UpdateResponse;
 import com.dingtalk.api.response.OapiV2UserGetbymobileResponse;
 import com.google.common.collect.Maps;
-import com.muzhi.baiqueling.common.EnvironmentVariables;
 import com.muzhi.baiqueling.service.AccessTokenService;
 import com.muzhi.baiqueling.service.MeikebaoxiaoService;
 import com.muzhi.baiqueling.common.R;
@@ -65,13 +64,6 @@ public class MeikebaoxiaoServiceImpl implements MeikebaoxiaoService {
     @Autowired
     private AccessTokenService accessTokenService;
 
-    private String approvalDetailUrl(String processInstanceId) {
-        return "https://applink.dingtalk.com/approval/detail?corpId="
-                + EnvironmentVariables.require("DINGTALK_CORP_ID")
-                + "&instanceId=" + processInstanceId
-                + "&from=" + EnvironmentVariables.require("DINGTALK_APP_KEY");
-    }
-
     public static com.aliyun.dingtalkworkflow_1_0.Client createClient() throws Exception {
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
         config.protocol = "https";
@@ -1375,7 +1367,7 @@ public class MeikebaoxiaoServiceImpl implements MeikebaoxiaoService {
             System.out.println("封装每刻报销【付款单】创建接口的参数:" + mapJsonString);
 
             /**调用钉钉连接器同步调用地址,进行触发连接器动作*/
-            dingtalkWebhook.dingtalkWebhook(EnvironmentVariables.require("DINGTALK_CONTRACT_WEBHOOK_URL"), mapJsonString);
+            dingtalkWebhook.dingtalkWebhook("https://connector.dingtalk.com/webhook/subflow/e126191e7cb9c0b9fa6cb9c7", mapJsonString);
         }else {
             System.out.println("无合同,不需要回传更新智能合同账款信息,但需要将返回结果设置为成功!");
 
@@ -1389,7 +1381,7 @@ public class MeikebaoxiaoServiceImpl implements MeikebaoxiaoService {
             System.out.println("封装每刻报销【付款单】创建接口的参数:" + mapJsonString);
 
             /**调用钉钉连接器同步调用地址,进行触发连接器动作*/
-            dingtalkWebhook.dingtalkWebhook(EnvironmentVariables.require("DINGTALK_CONTRACT_WEBHOOK_URL"), mapJsonString);
+            dingtalkWebhook.dingtalkWebhook("https://connector.dingtalk.com/webhook/subflow/e126191e7cb9c0b9fa6cb9c7", mapJsonString);
         }
 
         return mapAll;
@@ -1709,7 +1701,7 @@ public class MeikebaoxiaoServiceImpl implements MeikebaoxiaoService {
                         //超链接对象
                         Map chaolianjieMap = new HashMap();
                         chaolianjieMap.put("hyperlinkName", businessTitle);//超链接名称
-                        chaolianjieMap.put("hyperlinkAddress", approvalDetailUrl(processInstanceId));//AppLink超链接地址
+                        chaolianjieMap.put("hyperlinkAddress", "https://applink.dingtalk.com/approval/detail?corpId=dinga7888cab40bed80835c2f4657eb6378f&instanceId="+ processInstanceId +"&from=dingd93y9mnocx0byxbu");//AppLink超链接地址
                         mapCustom.put("filedBizCode12", chaolianjieMap);//超链接
                         //项目开始日期对象
                         Map xiangmukaishiriqiMap = new HashMap();
@@ -1814,7 +1806,7 @@ public class MeikebaoxiaoServiceImpl implements MeikebaoxiaoService {
                     //超链接对象
                     Map chaolianjieMap = new HashMap();
                     chaolianjieMap.put("hyperlinkName", businessTitle);//超链接名称
-                    chaolianjieMap.put("hyperlinkAddress", approvalDetailUrl(processInstanceId));//超链接地址
+                    chaolianjieMap.put("hyperlinkAddress", "https://applink.dingtalk.com/approval/detail?corpId=dinga7888cab40bed80835c2f4657eb6378f&instanceId="+ processInstanceId +"&from=dingd93y9mnocx0byxbu");//超链接地址
                     mapCustom.put("filedBizCode12", chaolianjieMap);//超链接
                     //项目开始日期对象
                     Map xiangmukaishiriqiMap = new HashMap();
@@ -1936,7 +1928,7 @@ public class MeikebaoxiaoServiceImpl implements MeikebaoxiaoService {
         System.out.println("封装每刻报销【合同】单据的参数:" + mapJsonString);
 
         /**调用钉钉连接器同步调用地址,进行触发连接器动作*/
-        dingtalkWebhook.dingtalkWebhook(EnvironmentVariables.require("DINGTALK_PAYMENT_WEBHOOK_URL"), mapJsonString);
+        dingtalkWebhook.dingtalkWebhook("https://connector.dingtalk.com/webhook/subflow/671acdf6ae87280eacb6ca9c", mapJsonString);
 
         return mapAll;
     }

+ 2 - 3
src/main/java/com/muzhi/baiqueling/service/impl/SapServiceImpl.java

@@ -9,7 +9,6 @@ import com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataResponse;
 import com.aliyun.tea.TeaException;
 import com.aliyun.teautil.models.RuntimeOptions;
 import com.muzhi.baiqueling.common.R;
-import com.muzhi.baiqueling.common.EnvironmentVariables;
 import com.muzhi.baiqueling.dingtalk.dingtalkWebhook;
 import com.muzhi.baiqueling.service.AccessTokenService;
 import com.muzhi.baiqueling.service.MeikebaoxiaoService;
@@ -202,7 +201,7 @@ public class SapServiceImpl implements SapService {
                 .url(URL + "/RESTAdapter/COPAPLAN")
                 .method("POST", body)
                 .addHeader("Content-Type", "application/json")
-                .addHeader("Cookie", EnvironmentVariables.require("SAP_COOKIE"))
+                .addHeader("Cookie", "saplb_*=(J2EE5907020)5907050")
                 .build();
 
         try {
@@ -1919,7 +1918,7 @@ public class SapServiceImpl implements SapService {
             createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken_YunpuPOC();
             com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest()
                     //应用秘钥
-                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+                    .setSystemToken("U4G66291B0Y4Z1LTIKH4QD5XHTNJ3YREYR6OMJ33")//云璞POC:XJ966GA126GX678XDP3AW5M8ZTSP39N7L5IDM85
                     //表单编码
                     .setFormUuid("FORM-349A5D1A8CBD4271BCEDBE94A60A7BCDOSXX")//云璞POC:FORM-64009DF27F5F479BBC82CD6C1768B5FAC0DY
                     .setUserId("yida_pub_account")

+ 7 - 8
src/test/java/com/muzhi/baiqueling/APITest/Test1.java

@@ -14,7 +14,6 @@ import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiV2UserGetbymobileRequest;
 import com.dingtalk.api.response.OapiV2UserGetbymobileResponse;
 import com.google.common.collect.Maps;
-import com.muzhi.baiqueling.common.EnvironmentVariables;
 import com.muzhi.baiqueling.common.R;
 import com.muzhi.baiqueling.service.AccessTokenService;
 import com.taobao.api.ApiException;
@@ -73,8 +72,8 @@ public class Test1 {
     public void test1(){
 
         //appCode和appSecret请联系每刻工作人员
-        String appCode = EnvironmentVariables.require("MAYCUR_APP_CODE");
-        String appSecret = EnvironmentVariables.require("MAYCUR_APP_SECRET");
+        String appCode = "AP4PID3GWDJ391";
+        String appSecret = "wZ4iAHvF6e4edBv2uAqY1zCAYAx5ud1M";
 
         long timeMillis = System.currentTimeMillis();
         System.out.println("timeMillis:" + timeMillis);
@@ -95,7 +94,7 @@ public class Test1 {
                 .url("https://ng.maycur.com/api/openapi/auth/login")
                 .method("POST", body)
                 .addHeader("Content-Type", "application/json")
-                .addHeader("Cookie", EnvironmentVariables.require("MAYCUR_COOKIE"))
+                .addHeader("Cookie", "acw_tc=3ccdc14717471251482292289e64b099ab9dc4d8fb4debb3229faf307c47f7")
                 .build();
         String code = "";
         String message = "";
@@ -128,8 +127,8 @@ public class Test1 {
         try {
             DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/getbymobile");
             OapiV2UserGetbymobileRequest req = new OapiV2UserGetbymobileRequest();
-            req.setMobile(EnvironmentVariables.require("DINGTALK_TEST_MOBILE"));
-            OapiV2UserGetbymobileResponse rsp = client.execute(req, EnvironmentVariables.require("DINGTALK_TEST_ACCESS_TOKEN"));
+            req.setMobile("15221837004");
+            OapiV2UserGetbymobileResponse rsp = client.execute(req, "22edcca76e223e39ba9dc8074af75a30");
             System.out.println(rsp.getBody());
         } catch (ApiException e) {
             e.printStackTrace();
@@ -856,7 +855,7 @@ public class Test1 {
                 .url(URL + "/RESTAdapter/COPAPLAN")
                 .method("POST", body)
                 .addHeader("Content-Type", "application/json")
-                .addHeader("Cookie", EnvironmentVariables.require("SAP_COOKIE"))
+                .addHeader("Cookie", "saplb_*=(J2EE5907020)5907050")
                 .build();
 
         try {
@@ -926,7 +925,7 @@ public class Test1 {
     @Test
     public void file(){
         try {
-            String fileUrl = EnvironmentVariables.require("TEST_FILE_DOWNLOAD_URL");
+            String fileUrl = "http://lippi-space-zjk.oss-cn-zhangjiakou.aliyuncs.com/yundisk0/iAEHAqRmaWxlA6h5dW5kaXNrMATOISwGrwXNDvkGzbFsB85o_3-gCM0C4g.file?Expires=1761575724&OSSAccessKeyId=LTAIjmWpzHta71rc&Signature=v96nfmAk2EBlbuJjefPJI2rr5lg%3D";
             //获取url文件名称、类型、大小
             String name = "test111";
             System.out.println("文件名称:" + name);