From 96757bf86a0f4c2d7f40731acf90a16c6c077f80 Mon Sep 17 00:00:00 2001 From: Lenovo Date: Sat, 6 Jul 2024 11:50:33 +0800 Subject: [PATCH] =?UTF-8?q?ip=E4=BB=A3=E7=90=86=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/AiController.java | 13 ++------- .../ruoyi/common/config/ProxyProperties.java | 2 +- .../service/impl/MeituanServiceImpl.java | 27 ++++++++++++++++++- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/AiController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/AiController.java index bb0659e..e039188 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/AiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/AiController.java @@ -27,7 +27,7 @@ public class AiController { private IBusAiInfoService aiInfoService; @GetMapping(value = "/login") - public void login() + public void login(String phoneNum, String virtualPhone) { String url = "https://ai002.ciopaas.com/api/login"; String userName = "zw982210"; @@ -46,7 +46,7 @@ public class AiController { String projectSn1 = projectSn.split(",")[0]; - String requestJson = "{\"api_key\": \""+apiKey+"\",\"user_sn\": \""+userSn+"\",\"source\": \"测试任务\",\"project_sn\": \""+projectSn1+"\",\"ai_user_sn\": \"SYSUSER|2665bcca63a2b5c724095fa01dce0470\",\"is_zidong\": \"on\",\"client_info_json\": {\"data\": [{\"姓名\": \"ws测试\",\"电话\": \"1761240322\",\"备注\": \"门店新客\",\"虚拟分机号\": \"9292\"}]},\"is_open_second_dialing\": \"1\",\n" + + String requestJson = "{\"api_key\": \""+apiKey+"\",\"user_sn\": \""+userSn+"\",\"source\": \"测试任务\",\"project_sn\": \""+projectSn1+"\",\"ai_user_sn\": \"SYSUSER|2665bcca63a2b5c724095fa01dce0470\",\"is_zidong\": \"on\",\"client_info_json\": {\"data\": [{\"姓名\": \"ws测试\",\"电话\": \""+phoneNum+"\",\"备注\": \"门店新客\",\"虚拟分机号\": \""+virtualPhone+"\"}]},\"is_open_second_dialing\": \"1\",\n" + "\"is_open_remove_duplication\": \"0\",\"dial_task_main_sn\": \"20240621203741220560000000000034\",\"is_append\": \"0\"}"; String requestUrl = "https://ai002.ciopaas.com/api/addJsonOfAsync"; String requestResult = HttpClientUtilT.doPostJson(requestUrl,header,requestJson); @@ -80,15 +80,6 @@ public class AiController { String talktimes = oj.getString("talktimes"); String mark = oj.getString("mark"); String source = oj.getString("source"); - System.out.println(id); - System.out.println(dial_task_main_sn); - System.out.println(phone); - System.out.println(virtual_extension_number); - System.out.println(connected_at); - System.out.println(disconnected_at); - System.out.println(talktimes); - System.out.println(mark); - System.out.println(source); BusAiInfo aiInfo = new BusAiInfo(); aiInfo.setSerialId(id); aiInfo.setDialTaskMainSn(dial_task_main_sn); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/ProxyProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/ProxyProperties.java index 56839b3..21ec4c2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/ProxyProperties.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/ProxyProperties.java @@ -26,7 +26,7 @@ public class ProxyProperties { @Value("${clientIP.proxyAddr}") private String proxyAddr; @Value("${clientIP.proxyPort}") - private String proxyPort; + private int proxyPort; @Value("${clientIP.account}") private String account; @Value("${clientIP.pwd}") diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index 3242e32..01467df 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -10,18 +10,23 @@ import com.ruoyi.business.domain.SysCookie; import com.ruoyi.business.mapper.BusStoreInfoMapper; import com.ruoyi.business.service.IBusStoreInfoService; import com.ruoyi.business.service.IMeituanService; +import com.ruoyi.common.config.ProxyProperties; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.HttpClientUtilT; import org.apache.http.HttpEntity; +import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; @@ -46,6 +51,8 @@ public class MeituanServiceImpl implements IMeituanService { @Autowired private IBusStoreInfoService busStoreInfoService; + @Autowired + private ProxyProperties proxyProperties; /** * 获取cookie @@ -342,7 +349,14 @@ public class MeituanServiceImpl implements IMeituanService { * @return */ private Boolean getScoreOne(BusStoreInfo store) { + + String proxyHost = proxyProperties.getProxyAddr(); + int proxyPort = proxyProperties.getProxyPort(); + HttpHost proxy = new HttpHost(proxyHost,proxyPort); + RequestConfig config = RequestConfig.custom().setProxy(proxy).build(); + CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(config).build(); String url = "https://waimaieapp.meituan.com/gw/customer/comment/scores"; + Map params = new HashMap<>(); params.put("ignoreSetRouterProxy",true); params.put("acctId",valueFromCookie("acctId",store.getStoreCookie())); @@ -350,7 +364,18 @@ public class MeituanServiceImpl implements IMeituanService { params.put("token",valueFromCookie("token",store.getStoreCookie())); params.put("appType",3); params.put("source",1); - String result = HttpClientUtilT.doGet(url,null,params); + String param = "?"; + for (Map.Entry stringObjectEntry : params.entrySet()) { + param = param + stringObjectEntry.getKey() + "=" + stringObjectEntry.getValue()+"&"; + } + url = url + param.substring(0, param.length()-1); + HttpGet request = new HttpGet(url); + String result = null; + try { + result = EntityUtils.toString(httpClient.execute(request).getEntity()); + }catch (Exception e) { + e.printStackTrace(); + } System.out.println(result);//落库 return true; }