From 973c20be1667b3e48cec4631a821703265c2164a Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Feb 2023 15:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=81=B5=E5=B1=B1=E8=A1=97?= =?UTF-8?q?=E9=81=93=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 8 +- epmet-auth/pom.xml | 4 +- .../tools/filter/LogMsgSendFilter.java | 2 +- .../tools/utils/DingdingMsgSender.java | 135 +++++++++--------- epmet-gateway/pom.xml | 4 +- .../data-aggregator-server/pom.xml | 32 ++--- .../data-report/data-report-server/pom.xml | 10 +- .../data-statistical-server/pom.xml | 36 ++--- .../epmet-activiti-server/pom.xml | 6 +- .../common-service-server/pom.xml | 6 +- .../epmet-ext/epmet-ext-server/pom.xml | 6 +- .../epmet-heart/epmet-heart-server/pom.xml | 8 +- .../epmet-job/epmet-job-server/pom.xml | 6 +- .../epmet-message-server/pom.xml | 8 +- .../epmet-oss/epmet-oss-server/pom.xml | 6 +- .../epmet-point/epmet-point-server/pom.xml | 8 +- .../epmet-third/epmet-third-server/pom.xml | 8 +- .../gov-access/gov-access-server/pom.xml | 6 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 +- .../gov-issue/gov-issue-server/pom.xml | 8 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 +- epmet-module/gov-org/gov-org-server/pom.xml | 8 +- .../gov-project/gov-project-server/pom.xml | 6 +- .../gov-voice/gov-voice-server/pom.xml | 6 +- .../open-data-worker-server/pom.xml | 8 +- .../oper-access/oper-access-server/pom.xml | 6 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 6 +- .../oper-customize-server/pom.xml | 8 +- .../resi-group/resi-group-server/pom.xml | 8 +- .../resi-guide/resi-guide-server/pom.xml | 6 +- .../resi-hall/resi-hall-server/pom.xml | 4 +- .../resi-home/resi-home-server/pom.xml | 4 +- .../resi-mine/resi-mine-server/pom.xml | 4 +- .../resi-partymember-server/pom.xml | 8 +- .../resi-voice/resi-voice-server/pom.xml | 4 +- epmet-openapi/epmet-openapi-scan/pom.xml | 4 +- epmet-user/epmet-user-server/pom.xml | 8 +- 37 files changed, 207 insertions(+), 206 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 3c9652cee8..0e0ba0adda 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,18 +254,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -279,7 +279,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 7a61b3e883..ed6c10e513 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -376,12 +376,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index bec26ea89d..c4e8481483 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -81,7 +81,7 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("\n"); } - stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()),DateUtils.DATE_TIME_PATTERN)); + stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()), DateUtils.DATE_TIME_PATTERN)); stringBuilder.append("\n"); stringBuilder.append("TraceId：").append(MDC.get(AppClientConstant.TRANSACTION_SERIAL_KEY)); stringBuilder.append("\n"); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java index 044b1d393c..34659460f3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java @@ -55,7 +55,8 @@ public class DingdingMsgSender { //阻塞取元素 msg = msgQueue.take(); if (msg != null) { - sendMsg(msg); + //sendMsg(msg); + sendMsgSdk(msg); } else { Thread.sleep(1000); } @@ -88,7 +89,7 @@ public class DingdingMsgSender { DingTalkTextMsg param = new DingTalkTextMsg(); param.setContent("待发送消息队列已满,当前队列个数" + msgQueue.size() + "\n" + "最新消息内容:" + JSON.toJSONString(messageParam)); param.setWebHook(messageParam.getWebHook()); - sendMsg(param); + sendMsgSdk(param); } return flag; } @@ -121,71 +122,71 @@ public class DingdingMsgSender { running = false; } - /** - * 发送POST 请求 - * - * @param param 请求参数，JSON格式 - * @return - */ - @Deprecated - private Result sendMsg(DingTalkTextMsg param) { - if (StringUtils.isBlank(param.getWebHook())) { - param.setWebHook(webHook); - } - if (StringUtils.isBlank(param.getSecret())) { - param.setSecret(secret); - } - Result result = new Result().error(); - try { - String url = getUrlString(param, System.currentTimeMillis()); - String jsonStrParam = param.getMsgContent(); - result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); - } catch (Exception e) { - logger.warn("sendPostByJSON error", e); - } - return result; - } - - @NotNull - private String getUrlString(DingTalkTextMsg param, Long timestamp) throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException { - String stringToSign = timestamp + "\n" + param.getSecret(); - Mac mac = Mac.getInstance("HmacSHA256"); - mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256")); - byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); - String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); - String url = param.getWebHook(); - url = url.concat("×tamp=" + timestamp + "&sign=" + sign); - return url; - } - - /** - * 发送POST 请求 - * - * @param param 请求参数，JSON格式 - * @return - */ - public Result sendMsgSdk(DingTalkTextMsg param) { - if (StringUtils.isBlank(param.getWebHook())) { - param.setWebHook(webHook); - } - if (StringUtils.isBlank(param.getSecret())) { - param.setSecret(secret); - } - Result result = new Result().error(); - try { - String url = getUrlString(param, System.currentTimeMillis()); - DefaultDingTalkClient client = new DefaultDingTalkClient(url); - OapiRobotSendRequest request = new OapiRobotSendRequest(); - request.setMsgtype("text"); - OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); - text.setContent(param.getContent()); - request.setText(text); - client.execute(request); - } catch (Exception e) { - logger.warn("sendPostByJSON error", e); - } - return result; - } + /** + * 发送POST 请求 + * + * @param param 请求参数，JSON格式 + * @return + */ + @Deprecated + private Result sendMsg(DingTalkTextMsg param) { + if (StringUtils.isBlank(param.getWebHook())) { + param.setWebHook(webHook); + } + if (StringUtils.isBlank(param.getSecret())) { + param.setSecret(secret); + } + Result result = new Result().error(); + try { + String url = getUrlString(param, System.currentTimeMillis()); + String jsonStrParam = param.getMsgContent(); + result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); + } catch (Exception e) { + logger.warn("sendPostByJSON error", e); + } + return result; + } + + @NotNull + private String getUrlString(DingTalkTextMsg param, Long timestamp) throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException { + String stringToSign = timestamp + "\n" + param.getSecret(); + Mac mac = Mac.getInstance("HmacSHA256"); + mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256")); + byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); + String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); + String url = param.getWebHook(); + url = url.concat("×tamp=" + timestamp + "&sign=" + sign); + return url; + } + + /** + * 发送POST 请求 + * + * @param param 请求参数，JSON格式 + * @return + */ + public Result sendMsgSdk(DingTalkTextMsg param) { + if (StringUtils.isBlank(param.getWebHook())) { + param.setWebHook(webHook); + } + if (StringUtils.isBlank(param.getSecret())) { + param.setSecret(secret); + } + Result result = new Result().error(); + try { + String url = getUrlString(param, System.currentTimeMillis()); + DefaultDingTalkClient client = new DefaultDingTalkClient(url); + OapiRobotSendRequest request = new OapiRobotSendRequest(); + request.setMsgtype("text"); + OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); + text.setContent(param.getContent()); + request.setText(text); + client.execute(request); + } catch (Exception e) { + logger.warn("sendPostByJSON error", e); + } + return result; + } public static void main(String[] args) { for (int i = 0; i < 50; i++) { diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 5059f095dd..32f70b48e4 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,12 +507,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5e9d427149..63f590b43b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -611,109 +611,109 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 50b9721035..9d3a4efd46 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -339,32 +339,32 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8641ce2ab5..64b18c4488 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -599,103 +599,103 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEtclOUdvIEwEr@w - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -722,7 +722,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index f54b143ceb..33164cd48a 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,18 +287,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index cec0f74b49..037902a450 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,18 +270,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 1edac9a30b..4d975e2c80 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 74b9c12d47..15841b7f64 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,18 +331,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 7b58b4270f..ba9a7781bd 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,18 +262,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 3917f18202..713f78b85f 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -319,18 +319,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -359,7 +359,7 @@ - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 123d8a0ccf..c919907267 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -275,18 +275,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 00e5e641c5..24b750bbfe 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,18 +290,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -327,7 +327,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 7350fd1625..e5b52a57ed 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -394,18 +394,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -435,7 +435,7 @@ + 10.0.0.4:9876--> false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 816130af05..dbcae08915 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,18 +248,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 863c2824f3..9f81af20b2 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,12 +234,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index ade7249954..b419c69d1f 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,18 +303,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -344,7 +344,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index b7cc735614..9fe9215b8e 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,12 +248,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 16ed0a372b..45f2822bb2 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -359,18 +359,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -399,7 +399,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 4fadcf287a..4cdd96861b 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -350,18 +350,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 9c14e7fa1f..d52b79a73e 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,18 +259,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index f20249f71c..cf42c8d76f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -273,18 +273,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -311,7 +311,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 36cdcf0515..80e4ae3a66 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,18 +244,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 44f243974f..7d5f68b362 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,18 +298,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 1e1098f1b0..b982cd3e62 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,18 +299,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -339,7 +339,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f0ce53a8ab..a72dc87944 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,18 +344,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -392,7 +392,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 4fe8a5cd3f..b4453419c0 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,18 +265,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index c435b8fbd3..ea5f9567a9 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 3a81efc107..1ecca5cb5e 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,12 +238,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 6457702a55..d460b84d4b 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,12 +254,12 @@ prod 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 5e1e75a610..5b7702d116 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -339,18 +339,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index a739b44bef..2816860ea0 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 8afc7839fd..725763d9d9 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,12 +219,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 3c540f6cd5..ded8a4478e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true