From 02b542d87da1e6cd539bfe9d34b3b2dc2f103cdf Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期六, 13 四月 2019 16:44:00 +0800
Subject: [PATCH] Set theme jekyll-theme-dinky

---
 RuleService/src/main/java/com/java110/rule/common/RuleCommon.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java b/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java
index 08708b5..5c33005 100644
--- a/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java
+++ b/RuleService/src/main/java/com/java110/rule/common/RuleCommon.java
@@ -49,7 +49,7 @@
         java.sql.Timestamp startTime = new java.sql.Timestamp(Calendar.getInstance().getTime().getTime());
 
         String condReturnXml = "";
-        Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+        Map<String,Rule> ruleMap = ruleDaoImpl.getRuleMap();
         Rule rule = ruleMap.get(ruleId);
 
         Map<String,String> map = new HashMap<String,String>();
@@ -96,7 +96,7 @@
 
         Map<String,String> returnMap = new HashMap<String,String>();
         dataStackMap = new HashMap<String,String>();
-        Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+        Map<String,Rule> ruleMap = ruleDaoImpl.getRuleMap();
         List<RuleCondCfg> ruleCondCfgList = ruleMap.get(ruleId).getRuleCondCfgs();
         ruleNodeMap = new HashMap<String,String>();
         ruleDbMap = new HashMap<String, List<Map<String,String>>>();
@@ -432,7 +432,7 @@
         java.sql.Timestamp startTime = new java.sql.Timestamp(Calendar.getInstance().getTime().getTime());
 
         String condReturnXml = "";
-        Map<String,Rule> ruleMap = RuleUtil.getRuleMap();
+        Map<String,Rule> ruleMap = ruleDaoImpl.getRuleMap();
         Rule rule = ruleMap.get(ruleId);
         if(!StringUtils.isEmpty(rule.getRule_url())){
 
@@ -496,6 +496,15 @@
         return errorMsg;
     }
 
+    /**
+     * 涓轰簡澶氱嚎绋嬫椂鍙互鐢ㄥ埌杩欓噷鎴戜滑涓浆涓�涓�
+     * @return
+     * @throws Exception
+     */
+    public Map<String,Rule> getRuleMap() throws Exception{
+       return ruleDaoImpl.getRuleMap();
+    }
+
     public void saveRuleCommonCondLog(String transactionID,String ruleID,String ruleNodeValue,Map<String,String> returnMap)  throws Exception {
        /* String retCode = returnMap.get("retCode");
         String retMsg = returnMap.get("retMsg");

--
Gitblit v1.8.0