瀏覽代碼

Restore original runtime configuration

zhangkan 3 周之前
父節點
當前提交
563a54b66a

+ 0 - 15
src/main/java/com/muzhi/dingtalk/test/config/EnvironmentVariables.java

@@ -1,15 +0,0 @@
-package com.muzhi.dingtalk.test.config;
-
-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;
-    }
-}

+ 9 - 3
src/main/java/com/muzhi/dingtalk/test/service/impl/DingAccessTokenServiceImpl.java

@@ -3,7 +3,6 @@ package com.muzhi.dingtalk.test.service.impl;
 import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.request.OapiGettokenRequest;
 import com.dingtalk.api.response.OapiGettokenResponse;
-import com.muzhi.dingtalk.test.config.EnvironmentVariables;
 import com.muzhi.dingtalk.test.service.DingAccessTokenService;
 import com.taobao.api.ApiException;
 import org.springframework.stereotype.Service;
@@ -18,6 +17,13 @@ import org.springframework.stereotype.Service;
 public class DingAccessTokenServiceImpl implements DingAccessTokenService{
     //DingAccessTokenService
 
+    //茅台
+    //APPKEY
+    private static String APPKEY = "dingiisvte8wte8g6svq";
+    //APPSECRET
+    private static String APPSECRET = "STpfocciVDAjEI-i-ibvOd11qM3iIPYA0bplYfqgNWwmMntOxTHJ8dZMCHXVOaEN";
+    //AgentId:1418526292
+
     public static String accessToken = null;
 
     //获取access_token的方法(茅台)
@@ -25,8 +31,8 @@ public class DingAccessTokenServiceImpl implements DingAccessTokenService{
     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);

+ 4 - 5
src/main/java/com/muzhi/dingtalk/test/service/impl/TongbuServiceImpl.java

@@ -19,7 +19,6 @@ import com.dingtalk.api.request.OapiSmartworkHrmEmployeeQueryonjobRequest;
 import com.dingtalk.api.response.OapiAttendanceGetcolumnvalResponse;
 import com.dingtalk.api.response.OapiSmartworkHrmEmployeeListResponse;
 import com.dingtalk.api.response.OapiSmartworkHrmEmployeeQueryonjobResponse;
-import com.muzhi.dingtalk.test.config.EnvironmentVariables;
 import com.muzhi.dingtalk.test.entity.Employee;
 import com.muzhi.dingtalk.test.mapper.EmployeeMapper;
 import com.muzhi.dingtalk.test.service.DingAccessTokenService;
@@ -178,7 +177,7 @@ public class TongbuServiceImpl implements TongbuService{
 //                        //宜搭应用编码
                     .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
                     //宜搭应用秘钥
-                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
                     //TODO 系统管理员id
                     .setUserId("yida_pub_account");
 
@@ -278,7 +277,7 @@ public class TongbuServiceImpl implements TongbuService{
 ////                        //宜搭应用编码
 //                    .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
 //                    //宜搭应用秘钥
-//                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+//                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
 //                    //TODO 系统管理员id
 //                    .setUserId("yida_pub_account");
 //
@@ -306,7 +305,7 @@ public class TongbuServiceImpl implements TongbuService{
             com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
             searchFormDatasHeaders.xAcsDingtalkAccessToken = dingAccessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
-                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
                     .setSearchFieldJson(mapAllStr)
                     .setFormUuid("FORM-4V966QC17NH9YTF4C4XJW60V10JJ33NNC7WFL4")
                     .setUserId("yida_pub_account")
@@ -384,7 +383,7 @@ public class TongbuServiceImpl implements TongbuService{
                         .setFormUuid("FORM-4V966QC17NH9YTF4C4XJW60V10JJ33NNC7WFL4")
                         .setPageNumber(pageNumber)
                         .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
-                        .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+                        .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
                         .setPageSize(pageSize)
                         .setTableFieldId(MXID)
                         .setUserId("yida_pub_account");

+ 4 - 4
src/main/resources/application.properties

@@ -13,14 +13,14 @@ server.tomcat.uri-encoding=UTF-8
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://localhost:3306/dingtalk?serverTimezone=GMT%2B8
 #spring.datasource.username=root
-#spring.datasource.password=${DB_PASSWORD}
+#spring.datasource.password=123456
 
 # mysql\u6570\u636E\u5E93\u8FDE\u63A5
 # \u3010\u8305\u53F0\u3011\u963F\u91CC\u4E91\u6570\u636E\u5E93
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=${DB_URL}
-spring.datasource.username=${DB_USERNAME}
-spring.datasource.password=${DB_PASSWORD}
+spring.datasource.url=jdbc:mysql://rm-uf634b0xt44ts5549o.mysql.rds.aliyuncs.com:3306/dingtalk?serverTimezone=GMT%2B8
+spring.datasource.username=maotai
+spring.datasource.password=Mtccbt0714
 
 #\u5B9A\u65F6\u540C\u6B65
 

+ 12 - 12
src/test/java/com/muzhi/dingtalk/test/mapper/Test2.java

@@ -38,9 +38,9 @@
 //
 //    //小荧星架构
 //    //APPKEY
-//    private static String APPKEY2 = EnvironmentVariables.require("DINGTALK_SECONDARY_APP_KEY");
+//    private static String APPKEY2 = "dingwkqbm4qelry54ltz";
 //    //APPSECRET
-//    private static String APPSECRET2 = EnvironmentVariables.require("DINGTALK_SECONDARY_APP_SECRET");
+//    private static String APPSECRET2 = "imAXdmrS3do1Gjc3x-pak7LDfRdgLW7Nsh5Jmh78V-LMY-mOO5Vw3W2xkPJ3T_UT";
 //
 //    public static String accessToken2 = null;
 //
@@ -467,7 +467,7 @@
 //            list3.add(obj4);
 //            obj1.setSections(list3);
 //            req.setShift(obj1);
-//            OapiAttendanceShiftAddResponse rsp = client.execute(req, EnvironmentVariables.require("DINGTALK_TEST_ACCESS_TOKEN"));
+//            OapiAttendanceShiftAddResponse rsp = client.execute(req, "b958d0d0eadc3daaa79895026a5fc4be");
 //            System.out.println(rsp.getBody());
 //        } catch (ApiException e) {
 //            e.printStackTrace();
@@ -766,7 +766,7 @@
 ////                        //宜搭应用编码
 //                    .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
 //                    //宜搭应用秘钥
-//                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+//                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
 //                    //TODO 系统管理员id
 //                    .setUserId("yida_pub_account");
 //
@@ -869,7 +869,7 @@
 //////                        //宜搭应用编码
 ////                    .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
 ////                    //宜搭应用秘钥
-////                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+////                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
 ////                    //TODO 系统管理员id
 ////                    .setUserId("yida_pub_account");
 ////
@@ -895,7 +895,7 @@
 //        try {
 //            com.aliyun.dingtalkyida_1_0.Client client = createClientYida();
 //            com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders searchFormDataSecondGenerationNoTableFieldHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders();
-//            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = EnvironmentVariables.require("YIDA_TEST_ACCESS_TOKEN");
+//            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = "5e3b8e46002e39f394e0efa1a2418e66";
 //            com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest searchFormDataSecondGenerationNoTableFieldRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest()
 ////                        //当前分页
 ////                        .setPageNumber(page)
@@ -908,7 +908,7 @@
 ////                        //宜搭应用编码
 //                    .setAppType("APP_Y1X1RBZEXEBHSPUKPLBD")
 //                    //宜搭应用秘钥
-//                    .setSystemToken(EnvironmentVariables.require("YIDA_TEST_SYSTEM_TOKEN"))
+//                    .setSystemToken("LO966L91IC7D8BQNBG5JXDH3Y2022CU7FD3LL8A")
 //                    //TODO 系统管理员id
 //                    .setUserId("yida_pub_account");
 //
@@ -1070,7 +1070,7 @@
 //////                        //宜搭应用编码
 ////                    .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
 ////                    //宜搭应用秘钥
-////                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+////                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
 ////                    //TODO 系统管理员id
 ////                    .setUserId("yida_pub_account");
 ////
@@ -1096,9 +1096,9 @@
 //        try {
 //        com.aliyun.dingtalkyida_1_0.Client client = createClient1();
 //        com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
-//        searchFormDatasHeaders.xAcsDingtalkAccessToken = EnvironmentVariables.require("YIDA_TEST_ACCESS_TOKEN");
+//        searchFormDatasHeaders.xAcsDingtalkAccessToken = "5e3b8e46002e39f394e0efa1a2418e66";
 //        com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
-//                .setSystemToken(EnvironmentVariables.require("YIDA_TEST_SYSTEM_TOKEN"))
+//                .setSystemToken("LO966L91IC7D8BQNBG5JXDH3Y2022CU7FD3LL8A")
 //                .setSearchFieldJson("{\"textField_lfw815u7\":\"2023-07\"}")
 //                .setFormUuid("FORM-MP966K81ET7DZ7ZFFY4Z770D3U9F2TV2HD3LL9")
 //                .setUserId("yida_pub_account")
@@ -1125,7 +1125,7 @@
 ////        try {
 ////            com.aliyun.dingtalkyida_1_0.Client client = createClientYida();
 ////            com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders searchFormDataSecondGenerationNoTableFieldHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders();
-////            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = EnvironmentVariables.require("YIDA_TEST_ACCESS_TOKEN");
+////            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = "5e3b8e46002e39f394e0efa1a2418e66";
 ////            com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest searchFormDataSecondGenerationNoTableFieldRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest()
 //////                        //当前分页
 //////                        .setPageNumber(page)
@@ -1138,7 +1138,7 @@
 //////                        //宜搭应用编码
 ////                    .setAppType("APP_Y1X1RBZEXEBHSPUKPLBD")
 ////                    //宜搭应用秘钥
-////                    .setSystemToken(EnvironmentVariables.require("YIDA_TEST_SYSTEM_TOKEN"))
+////                    .setSystemToken("LO966L91IC7D8BQNBG5JXDH3Y2022CU7FD3LL8A")
 ////                    //TODO 系统管理员id
 ////                    .setUserId("yida_pub_account");
 ////

+ 8 - 9
src/test/java/com/muzhi/dingtalk/test/mapper/Test3.java

@@ -14,7 +14,6 @@ import com.dingtalk.api.DefaultDingTalkClient;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.*;
 import com.dingtalk.api.response.*;
-import com.muzhi.dingtalk.test.config.EnvironmentVariables;
 import com.muzhi.dingtalk.test.entity.Employee;
 import com.muzhi.dingtalk.test.service.DingAccessTokenService;
 import com.muzhi.dingtalk.test.service.EmployeeService;
@@ -125,7 +124,7 @@ class Test3 {
 ////                        //宜搭应用编码
 //                    .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
 //                    //宜搭应用秘钥
-//                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+//                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
 //                    //TODO 系统管理员id
 //                    .setUserId("yida_pub_account");
 //
@@ -151,7 +150,7 @@ class Test3 {
         try {
             com.aliyun.dingtalkyida_1_0.Client client = createClientYida();
             com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders searchFormDataSecondGenerationNoTableFieldHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders();
-            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = EnvironmentVariables.require("YIDA_TEST_ACCESS_TOKEN");
+            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = "b7646382767630cfb025e37854d59c1b";
             com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest searchFormDataSecondGenerationNoTableFieldRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest()
 //                        //当前分页
 //                        .setPageNumber(page)
@@ -164,7 +163,7 @@ class Test3 {
 //                        //宜搭应用编码
                     .setAppType("APP_Y1X1RBZEXEBHSPUKPLBD")
                     //宜搭应用秘钥
-                    .setSystemToken(EnvironmentVariables.require("YIDA_TEST_SYSTEM_TOKEN"))
+                    .setSystemToken("LO966L91IC7D8BQNBG5JXDH3Y2022CU7FD3LL8A")
                     //TODO 系统管理员id
                     .setUserId("yida_pub_account");
 
@@ -257,7 +256,7 @@ class Test3 {
 ////                        //宜搭应用编码
 //                    .setAppType("APP_EEJKNFD4MHTY3RR25FY8")
 //                    //宜搭应用秘钥
-//                    .setSystemToken(EnvironmentVariables.require("YIDA_SYSTEM_TOKEN"))
+//                    .setSystemToken("S6666V916OI9FE9A9KE3XAV7IJSK2BHLC7WFLO")
 //                    //TODO 系统管理员id
 //                    .setUserId("yida_pub_account");
 //
@@ -283,9 +282,9 @@ class Test3 {
         try {
             com.aliyun.dingtalkyida_1_0.Client client = createClient1();
             com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders searchFormDatasHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasHeaders();
-            searchFormDatasHeaders.xAcsDingtalkAccessToken = EnvironmentVariables.require("YIDA_TEST_ACCESS_TOKEN");
+            searchFormDatasHeaders.xAcsDingtalkAccessToken = "b7646382767630cfb025e37854d59c1b";
             com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest searchFormDatasRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDatasRequest()
-                    .setSystemToken(EnvironmentVariables.require("YIDA_TEST_SYSTEM_TOKEN"))
+                    .setSystemToken("LO966L91IC7D8BQNBG5JXDH3Y2022CU7FD3LL8A")
                     .setSearchFieldJson("{\"textField_lfw815u7\":\"2024-02\"}")
                     .setFormUuid("FORM-MP966K81ET7DZ7ZFFY4Z770D3U9F2TV2HD3LL9")
                     .setUserId("yida_pub_account")
@@ -312,7 +311,7 @@ class Test3 {
 //        try {
 //            com.aliyun.dingtalkyida_1_0.Client client = createClientYida();
 //            com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders searchFormDataSecondGenerationNoTableFieldHeaders = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldHeaders();
-//            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = EnvironmentVariables.require("YIDA_TEST_ACCESS_TOKEN");
+//            searchFormDataSecondGenerationNoTableFieldHeaders.xAcsDingtalkAccessToken = "5e3b8e46002e39f394e0efa1a2418e66";
 //            com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest searchFormDataSecondGenerationNoTableFieldRequest = new com.aliyun.dingtalkyida_1_0.models.SearchFormDataSecondGenerationNoTableFieldRequest()
 ////                        //当前分页
 ////                        .setPageNumber(page)
@@ -325,7 +324,7 @@ class Test3 {
 ////                        //宜搭应用编码
 //                    .setAppType("APP_Y1X1RBZEXEBHSPUKPLBD")
 //                    //宜搭应用秘钥
-//                    .setSystemToken(EnvironmentVariables.require("YIDA_TEST_SYSTEM_TOKEN"))
+//                    .setSystemToken("LO966L91IC7D8BQNBG5JXDH3Y2022CU7FD3LL8A")
 //                    //TODO 系统管理员id
 //                    .setUserId("yida_pub_account");
 //