From 8899a6a91378d809873a9d061929c063e0c5e97c Mon Sep 17 00:00:00 2001 From: tangft <32189@DESKTOP-M6TAG3K> Date: Tue, 11 Dec 2018 16:33:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=9F=E9=87=91=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=B9=A6=E9=87=8D=E6=96=B0=E5=88=9B=E5=BB=BA=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 40 +++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 2ed6481c8..c965c3a5a 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -3920,5 +3920,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 56a086b87e700f8ef5faea4bf46c08b37c2143e6 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 11 Dec 2018 19:20:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=8E=E6=9C=8D=E5=8A=A1=E5=99=A8IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_tenwa/com/tenwa/lease/util/SendMessageUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/lease/util/SendMessageUtil.java b/src_tenwa/com/tenwa/lease/util/SendMessageUtil.java index 125d20f28..acf126e24 100644 --- a/src_tenwa/com/tenwa/lease/util/SendMessageUtil.java +++ b/src_tenwa/com/tenwa/lease/util/SendMessageUtil.java @@ -44,8 +44,10 @@ public class SendMessageUtil{ List messageConfigList = JBOFactory.getBizObjectManager(LB_MESSAGE_CONFIG.CLASS_NAME).createQuery("1=1").getResultList(false); BizObject messageConfig = messageConfigList.get(0); String allowSendIps = messageConfig.getAttribute("ALLOW_SEND_IPS").getString(); + //Ӵӷip + String slaveSendIp="{172.28.1.63}"; //жϱúõIPǷеķ - if("N".equals(messageConfig.getAttribute("IS_SEND").getString()) || !getServerIsAllowSendMsg(allowSendIps)){ + if("N".equals(messageConfig.getAttribute("IS_SEND").getString()) || !getServerIsAllowSendMsg(allowSendIps) || !getServerIsAllowSendMsg(slaveSendIp)){ System.out.println("ΪͶŻ򱾻IPδ[ͶŵIP]֮!"); return "ǰϵͳIP͵IPַ֮"; }