Explorar el Código

Restore original runtime configuration

zhangkan hace 3 semanas
padre
commit
6d6fb01b8b

+ 8 - 8
src/main/java/com/muzhi/yinzhou/service/impl/AccessTokenServiceImpl.java

@@ -5,7 +5,6 @@ import com.dingtalk.api.request.OapiGettokenRequest;
 import com.dingtalk.api.response.OapiGettokenResponse;
 import com.muzhi.yinzhou.service.AccessTokenService;
 import com.taobao.api.ApiException;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 
@@ -17,11 +16,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class AccessTokenServiceImpl implements AccessTokenService {
 
-    @Value("${dingtalk.app-key}")
-    private String appKey;
-
-    @Value("${dingtalk.app-secret}")
-    private String appSecret;
+    //宁波鄞州
+    //APPKEY
+    private static String APPKEY = "dingtw7exnpqr6yxkfpy";
+    //APPSECRET
+    private static String APPSECRET = "5nh8pcWpPOL4ElWTpSDihsaGgsEEIvnMSYyMXDCXTrJeX-JUYP17pPLV7pdsqHUB";
+    //AgenthId:2461745390
 
     public static String accessToken = null;
 
@@ -31,8 +31,8 @@ public class AccessTokenServiceImpl implements AccessTokenService {
     public String getAccessToken() {
         DefaultDingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/gettoken");
         OapiGettokenRequest request = new OapiGettokenRequest();
-        request.setAppkey(appKey);
-        request.setAppsecret(appSecret);
+        request.setAppkey(APPKEY);
+        request.setAppsecret(APPSECRET);
         request.setHttpMethod("GET");
         try {
             OapiGettokenResponse response = client.execute(request);

+ 7 - 11
src/main/java/com/muzhi/yinzhou/service/impl/DingOaServiceImpl.java

@@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -30,9 +29,6 @@ public class DingOaServiceImpl implements DingOaService {
     @Autowired
     private AccessTokenService accessTokenService;
 
-    @Value("${dingtalk.system-token}")
-    private String systemToken;
-
     //鄞州系统固定ip地址
     //原始第一版
 //    public static String IP = "http://60.12.214.181:8001";
@@ -129,7 +125,7 @@ public class DingOaServiceImpl implements DingOaService {
                 createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
                 com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest()
                         //应用秘钥
-                        .setSystemToken(systemToken)
+                        .setSystemToken("UG8660A1FC09AKUN9PDJZ6DNL1JL23Z6VH6FL9")
                         //表单编码
                         .setFormUuid("FORM-4V966QC1XJZA2ZXE9SG4SA20AEBN3Y38NVZHLF")
                         .setUserId("yida_pub_account")
@@ -268,7 +264,7 @@ public class DingOaServiceImpl implements DingOaService {
                     createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
                     com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest()
                             //应用秘钥
-                            .setSystemToken(systemToken)
+                            .setSystemToken("UG8660A1FC09AKUN9PDJZ6DNL1JL23Z6VH6FL9")
                             //表单编码
                             .setFormUuid("FORM-3J866L81L9W8IA0KB5XHB8O7EQ613JPNVH6FLZ")
                             .setUserId("yida_pub_account")
@@ -462,7 +458,7 @@ public class DingOaServiceImpl implements DingOaService {
                 createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
                 com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest()
                         //应用秘钥
-                        .setSystemToken(systemToken)
+                        .setSystemToken("UG8660A1FC09AKUN9PDJZ6DNL1JL23Z6VH6FL9")
                         //表单编码
                         .setFormUuid("FORM-S9866D9155Q9WMPQBP7GXAIVGZQA382II9CGLD")
                         .setUserId("yida_pub_account")
@@ -650,7 +646,7 @@ public class DingOaServiceImpl implements DingOaService {
 //                createOrUpdateFormDataHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
 //                com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest createOrUpdateFormDataRequest = new com.aliyun.dingtalkyida_1_0.models.CreateOrUpdateFormDataRequest()
 //                        //应用秘钥
-//                        .setSystemToken(systemToken)
+//                        .setSystemToken("UG8660A1FC09AKUN9PDJZ6DNL1JL23Z6VH6FL9")
 //                        //表单编码
 //                        .setFormUuid("FORM-3J866L81L9W8IA0KB5XHB8O7EQ613JPNVH6FLZ")
 //                        .setUserId("yida_pub_account")
@@ -691,7 +687,7 @@ public class DingOaServiceImpl implements DingOaService {
             com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDHeaders getFormDataByIDHeaders = new com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDHeaders();
             getFormDataByIDHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDRequest getFormDataByIDRequest = new com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDRequest()
-                    .setSystemToken(systemToken)
+                    .setSystemToken("UG8660A1FC09AKUN9PDJZ6DNL1JL23Z6VH6FL9")
                     .setUserId("yida_pub_account")
                     .setAppType("APP_FOEXETG2TIN2O8TIS1Z2");
 
@@ -937,7 +933,7 @@ public class DingOaServiceImpl implements DingOaService {
             com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDHeaders getFormDataByIDHeaders = new com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDHeaders();
             getFormDataByIDHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDRequest getFormDataByIDRequest = new com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDRequest()
-                    .setSystemToken(systemToken)
+                    .setSystemToken("UG8660A1FC09AKUN9PDJZ6DNL1JL23Z6VH6FL9")
                     .setUserId("yida_pub_account")
                     .setAppType("APP_FOEXETG2TIN2O8TIS1Z2");
 
@@ -1160,7 +1156,7 @@ public class DingOaServiceImpl implements DingOaService {
             com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDHeaders getFormDataByIDHeaders = new com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDHeaders();
             getFormDataByIDHeaders.xAcsDingtalkAccessToken = accessTokenService.getAccessToken();
             com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDRequest getFormDataByIDRequest = new com.aliyun.dingtalkyida_1_0.models.GetFormDataByIDRequest()
-                    .setSystemToken(systemToken)
+                    .setSystemToken("UG8660A1FC09AKUN9PDJZ6DNL1JL23Z6VH6FL9")
                     .setUserId("yida_pub_account")
                     .setAppType("APP_FOEXETG2TIN2O8TIS1Z2");
 

+ 3 - 7
src/main/resources/application.properties

@@ -3,10 +3,6 @@ server.servlet.context-path=/yinzhou
 
 server.tomcat.uri-encoding=UTF-8
 
-dingtalk.app-key=${DINGTALK_APP_KEY:}
-dingtalk.app-secret=${DINGTALK_APP_SECRET:}
-dingtalk.system-token=${DINGTALK_SYSTEM_TOKEN:}
-
 ## 服务名
 #spring.application.name=yinzhou-yd
 ## 环境设置:dev、test、prod(开发环境、测试环境、生产环境)
@@ -17,13 +13,13 @@ dingtalk.system-token=${DINGTALK_SYSTEM_TOKEN:}
 #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
 
 # 云璞【47.98.130.40服务器】测试数据库
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=${DB_URL}
+#spring.datasource.url=jdbc:mysql://47.97.181.40:3306/dingtalk?serverTimezone=GMT%2B8
 #spring.datasource.username=root
-#spring.datasource.password=${DB_PASSWORD}
+#spring.datasource.password=cp-root@2022++
 
 #定时同步
 

+ 6 - 5
src/test/java/com/muzhi/yinzhou/APITest/Test1.java

@@ -152,13 +152,13 @@ public class Test1 {
         /*秘钥
          * AppSecret应用秘钥
          * */
-        String AppSecret = System.getenv("SHB_APP_SECRET");
+        String AppSecret = "f7585e1f2c4c25682f407af23b7ff7d5f21f4f9e3715c294";
 
         //加密后的字符串
         String encodeStr= DigestUtils.md5Hex(AppSecret + "_" + timestamp);
 
         Map map = new HashMap();
-        map.put("appKey", System.getenv("SHB_APP_KEY"));
+        map.put("appKey","shbqv00tso4dg5kcjz");
         map.put("timestamp",timestamp);
         map.put("verifyCode",encodeStr);
         String parmsStr = JSON.toJSONString(map);
@@ -177,6 +177,7 @@ public class Test1 {
                     .url("https://oapi.shb.ltd/service/auth/get_access_token")
                     .method("POST", body)
                     .addHeader("Content-Type", "application/json")
+                    .addHeader("Cookie", "acw_tc=0a45662a16728986832314856e80f39124201b89184960430078b3ebfda740")
                     .build();
 
             Response response = client.newCall(request).execute();
@@ -213,7 +214,7 @@ public class Test1 {
         MediaType mediaType = MediaType.parse("application/json");
         RequestBody body = RequestBody.create(mediaType, "{\r\n    \"pageSize\":50,\r\n    \"pageNum\":1\r\n}");
         Request request = new Request.Builder()
-                .url("https://oapi.shb.ltd/service/customer/get_customers?accessToken=" + System.getenv("SHB_ACCESS_TOKEN"))
+                .url("https://oapi.shb.ltd/service/customer/get_customers?accessToken=1755842d-7e5d-4fa7-be34-52263c2f7d54")
                 .method("POST", body)
                 .addHeader("Content-Type", "application/json")
                 .build();
@@ -231,7 +232,7 @@ public class Test1 {
         OkHttpClient client = new OkHttpClient().newBuilder()
                 .build();
         Request request = new Request.Builder()
-                .url("https://oapi.shb.ltd/service/task/get_task_types?accessToken=" + System.getenv("SHB_ACCESS_TOKEN"))
+                .url("https://oapi.shb.ltd/service/task/get_task_types?accessToken=1755842d-7e5d-4fa7-be34-52263c2f7d54")
                 .method("GET", null)
                 .build();
 
@@ -265,7 +266,7 @@ public class Test1 {
         MediaType mediaType = MediaType.parse("application/json");
         RequestBody body = RequestBody.create(mediaType, "{\r\n    \"cusNo\":\"CUSEH00762\",\r\n    \"cusName\":\"上海市松江区城市管理行政执法局执法大队岳阳街道中队\",\r\n    \"address\":\"西林北路367号\",\r\n    \"lmName\":\"陆老师\",\r\n    \"lmPhone\":\"13371958895\",\r\n    \"templateId\":\"279bb347-913e-4627-bffc-605317774885\",\r\n    \"templateName\":\"安装工单\",\r\n    \"planTime\":\"2023-03-19\"\r\n}");
         Request request = new Request.Builder()
-                .url("https://oapi.shb.ltd/service/task/create_task_v2?accessToken=" + System.getenv("SHB_ACCESS_TOKEN"))
+                .url("https://oapi.shb.ltd/service/task/create_task_v2?accessToken=1755842d-7e5d-4fa7-be34-52263c2f7d54")
                 .method("POST", body)
                 .addHeader("Content-Type", "application/json")
                 .build();