crm rest

yudao-server/src/main/java/cn/iocoder/yudao/server/rest/CrmRest.java

@@ -34,10 +34,12 @@ public class CrmRest {
     private static final String REDIRECT_URI = "https://api-tencent.xiaoshouyi.com/";
     private final CrmNoticeMapper crmNoticeMapper;
     private final CrmPersonMapper crmPersonMapper;
+    private final RestTemplate restTemplate;
 
-    public CrmRest(CrmNoticeMapper crmNoticeMapper, CrmPersonMapper crmPersonMapper) {
+    public CrmRest(CrmNoticeMapper crmNoticeMapper, CrmPersonMapper crmPersonMapper, RestTemplate restTemplate) {
         this.crmNoticeMapper = crmNoticeMapper;
         this.crmPersonMapper = crmPersonMapper;
+        this.restTemplate = restTemplate;
     }
 
     /**
@@ -48,13 +50,17 @@ public class CrmRest {
     public ImmutableMap<String, String> refreshToken(String refreshToken) {
         HttpHeaders headers = new HttpHeaders();
         HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
-        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+//        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
 
         String result = restTemplate.postForObject("https://login.xiaoshouyi.com/auc/oauth2/token?grant_type=refresh_token&client_id="
                 +CLIENT_ID+"&client_secret="+CLIENT_SECRET+"&refresh_token="+refreshToken, requestEntity, String.class);
         JSONObject jsonObject = JSON.parseObject(result);
         String accessToken = String.valueOf(jsonObject.get("access_token"));
         String refreshToken1 = String.valueOf(jsonObject.get("refresh_token"));
+
+        System.out.println("refreshToken:"+refreshToken);
+        System.out.println(refreshToken1);
+        System.out.println("accessToken:"+accessToken);
         return ImmutableMap.of("access",accessToken,"refresh",refreshToken1);
     }
 
@@ -68,7 +74,7 @@ public class CrmRest {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Authorization", token);
         HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
-        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+//        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
         ResponseEntity<String> exchange = restTemplate.exchange("https://api-tencent.xiaoshouyi.com/rest/data/v2/query?" +
                         "q=select id,name,unionId,phone,personalEmail from user where unionId is not null limit 0,300",
                 HttpMethod.GET, requestEntity, String.class);
@@ -113,7 +119,7 @@ public class CrmRest {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Authorization", token);
         HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
-        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+//        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
         ResponseEntity<String> exchange = restTemplate.exchange("https://api-tencent.xiaoshouyi.com/rest/data/v2/query?" +
                         "q=select id,name,unionId,phone,personalEmail from user where unionId is not null limit 0,300",
                 HttpMethod.GET, requestEntity, String.class);
@@ -149,7 +155,7 @@ public class CrmRest {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Authorization", token);
         HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
-        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+//        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
         System.out.println("------------------token"+token);
         System.out.println("888888888888888888crmUserId"+crmUserId);
         System.out.println("******************type"+type);
@@ -178,7 +184,7 @@ public class CrmRest {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Authorization", token);
         HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(headers);
-        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
+//        RestTemplate restTemplate = SslSkippingRestTemplate.createRestTemplate();
         ResponseEntity<String> exchange = restTemplate.exchange("https://api-tencent.xiaoshouyi.com/rest/notice/v2.0/notice/actions/list?userId="+crmUserId+"&pageNo=1&pageSize=1000",
                 HttpMethod.GET, requestEntity, String.class);
         JSONArray objects = null;