From e1bf9de48d54e67cd10641b3f5a30f6816baede2 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 13 Apr 2023 17:10:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B0=86epmet-cloud?= =?UTF-8?q?.elinkservice.cn=E5=BE=AE=E4=BF=A1=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E7=94=A8=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?=E7=94=B1http://198.18.132.1:10264=E8=B5=B0nginx=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E8=BD=AC=E5=8F=91=E5=88=B0epmet-cloud=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/pom.xml | 8 ++++---- .../java/com/epmet/constant/AuthHttpUrlConstant.java | 6 +++--- .../main/java/com/epmet/constant/ThirdApiConstant.java | 10 +++++----- .../com/epmet/service/impl/WxmpMessageServiceImpl.java | 10 +++++----- .../src/main/java/com/epmet/utils/ThirdUtils.java | 2 +- .../com/epmet/wxapi/constant/WxMaCodeConstant.java | 2 +- .../com/epmet/service/impl/CustomerServiceImpl.java | 6 +++--- .../service/impl/CustomerStartPageServiceImpl.java | 2 +- .../service/impl/FunctionCustomizedServiceImpl.java | 2 +- .../java/com/epmet/constant/GuideHttpUrlConstant.java | 2 +- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 53abdc9765..5f10f9c8c9 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -225,7 +225,7 @@ xSMONWwP UUCnxLyXiB4eBF4p - https://epmet-cloud.elinkservice.cn + http://198.18.132.1:10264 true @@ -291,7 +291,7 @@ xSMONWwP UUCnxLyXiB4eBF4p - https://epmet-cloud.elinkservice.cn + http://198.18.132.1:10264 true @@ -352,7 +352,7 @@ xSMONWwP UUCnxLyXiB4eBF4p - https://epmet-cloud.elinkservice.cn + http://198.18.132.1:10264 true @@ -421,7 +421,7 @@ xSMONWwP UUCnxLyXiB4eBF4p - https://epmet-cloud.elinkservice.cn + http://198.18.132.1:10264 true diff --git a/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java b/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java index dc3ec4e07d..cb6ecf6194 100644 --- a/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java +++ b/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java @@ -9,16 +9,16 @@ public interface AuthHttpUrlConstant { /** * 注册url */ - String REGISTER_URL = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/register"; + String REGISTER_URL = "http://198.18.132.1:10264/api/third/pacustomer/register"; /** * 获取客户信息url */ - String CUSTOMER_MSG_URL = "https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/"; + String CUSTOMER_MSG_URL = "http://198.18.132.1:10264/api/third/customermp/getcustomermsg/"; /** * 登录url */ - String RESI_AND_WORK_LOGIN_URL = "https://epmet-cloud.elinkservice.cn/api/third/customermp/resiandworklogin"; + String RESI_AND_WORK_LOGIN_URL = "http://198.18.132.1:10264/api/third/customermp/resiandworklogin"; } diff --git a/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java b/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java index 80bd70e7b7..f2e80a088d 100644 --- a/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java +++ b/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java @@ -9,22 +9,22 @@ public interface ThirdApiConstant { /** * 根据openId新增或更新用户信息 */ - String THIRD_PAUSER_SAVEUSER = "https://epmet-cloud.elinkservice.cn/api/third/pauser/saveuser"; + String THIRD_PAUSER_SAVEUSER = "http://198.18.132.1:10264/api/third/pauser/saveuser"; /** * 根据手机号查询公众号用户基本信息，校验用户是否存在 */ - String THIRD_PAUSER_CHECKPAUSER = "https://epmet-cloud.elinkservice.cn/api/third/pauser/checkpauser"; + String THIRD_PAUSER_CHECKPAUSER = "http://198.18.132.1:10264/api/third/pauser/checkpauser"; /** * 用户登陆，新增访问记录数据 */ - String THIRD_PAUSERVISITED_SAVEUSERVISITED = "https://epmet-cloud.elinkservice.cn/api/third/pauservisited/saveuservisited"; + String THIRD_PAUSERVISITED_SAVEUSERVISITED = "http://198.18.132.1:10264/api/third/pauservisited/saveuservisited"; /** * 根据客户Id查询各项注册信息 */ - String THIRD_PACUSTOMER_GETCUSTOMERAGENCYUSER = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/getcustomeragencyuser/"; + String THIRD_PACUSTOMER_GETCUSTOMERAGENCYUSER = "http://198.18.132.1:10264/api/third/pacustomer/getcustomeragencyuser/"; /** * 修改客户数据状态为已完成初始化 */ - String THIRD_PACUSTOMER_UPDATECUSTOMER = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/updatecustomer/"; + String THIRD_PACUSTOMER_UPDATECUSTOMER = "http://198.18.132.1:10264/api/third/pacustomer/updatecustomer/"; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java index 5a4b39f502..8be83b4bcc 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java @@ -578,7 +578,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { } govAccessToken = (String) authorizerRefreshToken.get(WxmpMessageConstant.AUTHORIZER_ACCESS_TOKEN); } else { - String url = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/tokenlist"; + String url = "http://198.18.132.1:10264/api/third/pacustomer/tokenlist"; JSONObject postData = new JSONObject(); postData.put("customerId", customerId); String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(postData)).getData(); @@ -611,7 +611,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { @Override public List templateList(GetTemplateListFormDTO formDTO) { GetTemplateListFormDTO dto = ConvertUtils.sourceToTarget(formDTO, GetTemplateListFormDTO.class); - String url = "https://epmet-cloud.elinkservice.cn/api/third/personaltemplate/templatelist"; + String url = "http://198.18.132.1:10264/api/third/personaltemplate/templatelist"; //String url = "http://localhost:8080/api/third/personaltemplate/templatelist"; String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto)).getData(); logger.info("ThirdLoginServiceImpl.getUserWeChat：httpclient->url:" + url + "，结果->" + data); @@ -646,7 +646,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { */ @Override public List templateListV2(TemplateListV2FormDTO formDTO) { - String url = "https://epmet-cloud.elinkservice.cn/api/third/personaltemplate/templatelistv2"; + String url = "http://198.18.132.1:10264/api/third/personaltemplate/templatelistv2"; // String url = "http://localhost:8110/third/personaltemplate/templatelistv2"; String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(formDTO)).getData(); logger.info("ThirdLoginServiceImpl.templatelistv2：httpclient->url:" + url + "，结果->" + data); @@ -676,7 +676,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { * @author sun */ public List customerTemplateList(CustomerTemplateListFormDTO formDTO) { - String url = "https://epmet-cloud.elinkservice.cn/api/third/personaltemplate/customertemplatelist"; + String url = "http://198.18.132.1:10264/api/third/personaltemplate/customertemplatelist"; String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(formDTO)).getData(); logger.info("ThirdLoginServiceImpl.customerTemplateList：httpclient->url:" + url + "，结果->" + data); JSONObject toResult = JSON.parseObject(data); @@ -899,7 +899,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { * @author sun */ private PaCustomerDTO thirdCustomer(String customerId) { - String url = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/" + customerId; + String url = "http://198.18.132.1:10264/api/third/pacustomer/" + customerId; Result data = HttpClientManager.getInstance().sendGet(url, null); logger.info("WxmpMessageServiceImpl.thirdCustomer：httpclient->url:" + url + "，结果->" + data); if (!data.success()) { diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java index c4be1156a9..380af2210f 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java @@ -28,7 +28,7 @@ public class ThirdUtils { EnvEnum envEnum = EnvEnum.getCurrentEnv(); AccessTokenDTO accessToken = new AccessTokenDTO(); - String url = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/tokenlist"; + String url = "http://198.18.132.1:10264/api/third/pacustomer/tokenlist"; JSONObject postData = new JSONObject(); postData.put("customerId", customerId); String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(postData)).getData(); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java index 735a3b4569..5197d1eb91 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java @@ -28,7 +28,7 @@ public interface WxMaCodeConstant { /** * 反参授权回调url */ - String API_RETURN_REDIRECT_URL = "https://epmet-cloud.elinkservice.cn/api/third/redirectauthcode/%s/%s"; + String API_RETURN_REDIRECT_URL = "http://198.18.132.1:10264/api/third/redirectauthcode/%s/%s"; /** * 前端地址 【授权之后的跳转的地址】 diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 0c1c2a3d47..9f0c54fc08 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -451,7 +451,7 @@ public class CustomerServiceImpl extends BaseServiceImplurl:" + url + "，结果->" + data); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java index 4134eed6ac..63a79d62ce 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java @@ -275,7 +275,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl NumConstant.ZERO) { resiDomains = resiDomains.stream().distinct().collect(Collectors.toList()); WebviewDomainFormDTO domainFormDTO = new WebviewDomainFormDTO(); diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java index b3496051ff..fedacb2527 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java @@ -6,6 +6,6 @@ package com.epmet.constant; */ public interface GuideHttpUrlConstant { - String CUSTOMER_MSG_URL = "https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/"; + String CUSTOMER_MSG_URL = "http://198.18.132.1:10264/api/third/customermp/getcustomermsg/"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index ce0ae4cb7f..7888b05c08 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3515,8 +3515,8 @@ public class IcResiUserServiceImpl extends BaseServiceImplurl:https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/ ，结果->" + data); + String data = HttpClientManager.getInstance().sendPostByJSON("http://198.18.132.1:10264/api/third/customermp/getcustomermsg/" + appId, JSON.toJSONString(jsonObject)).getData(); + logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:http://198.18.132.1:10264/api/third/customermp/getcustomermsg/ ，结果->" + data); JSONObject toResult = JSON.parseObject(data); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); if (null != toResult.get("code")) {