redis db config

pom.xml

@@ -51,6 +51,7 @@
 
 				<redis.surl.host>192.168.2.57</redis.surl.host>
 				<redis.surl.port>6379</redis.surl.port>
+				<redis.surl.database>1</redis.surl.database>
 
 				<redis.event.host>192.168.2.57</redis.event.host>
 				<redis.event.port>6379</redis.event.port>
@@ -78,11 +79,11 @@
 				<report.url>http://172.31.1.122:9010</report.url>
 
 				<presto.driver>com.facebook.presto.jdbc.PrestoDriver</presto.driver>
-				<presto.url>jdbc:presto://172.31.11.248:18889/hive/default</presto.url>
+				<presto.url>jdbc:presto://ec2-54-223-169-225.cn-north-1.compute.amazonaws.com.cn:8889/hive/default</presto.url>
 				<presto.username>root</presto.username>
 
                 <profile.table>kudu.default.profile_</profile.table>
-                <event.table>tkio_bigtable_view.event_</event.table>
+                <event.table>tkio_bigtable.event_</event.table>
                 <usergroup.table>tkio_bigtable.tkio_user_group_preview</usergroup.table>
 
 				<hive.driver>org.apache.hive.jdbc.HiveDriver</hive.driver>
@@ -167,6 +168,7 @@
 				<redis.surl.port>6379</redis.surl.port>
 				<cache.livetime>300</cache.livetime>
 				<iscache>0</iscache>
+				<redis.surl.database>1</redis.surl.database>
 
 				<redis.event.host>io-split-wenqiang.dgfxhr.0001.cnn1.cache.amazonaws.com.cn</redis.event.host>
 				<redis.event.port>6379</redis.event.port>

src/main/java/com/reyun/util/SqlUtil.java

@@ -9,7 +9,9 @@ import net.sf.json.JSONObject;
 import org.springframework.util.StringUtils;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -94,6 +96,14 @@ public class SqlUtil
         StringBuilder sqlWhere = new StringBuilder();
         sqlWhere.append(" 1 = 1 ");
 
+       /* if (!StringUtil.isEmpty(eventCondition)) {
+            try {
+                eventCondition = URLDecoder.decode(eventCondition, "utf-8");
+            } catch (UnsupportedEncodingException e) {
+                System.out.println("fail to decode eventcondition");
+            }
+        }*/
+
         JSONObject conditionObject = JSONObject.fromObject(eventCondition);
 
         String eventName = conditionObject.getString("event");

src/main/resources/applicationContext-schedule.xml

@@ -9,11 +9,11 @@
 
     <description>调度配置</description>
 
-    <!--<bean id="autoCalculateFlow" class="com.reyun.task.AutoCalculateFlow"></bean>-->
-    <!--<bean id="exportReportTask" class="com.reyun.task.ExportReportTask"></bean>-->
+    <bean id="autoCalculateFlow" class="com.reyun.task.AutoCalculateFlow"></bean>
+    <bean id="exportReportTask" class="com.reyun.task.ExportReportTask"></bean>
 
-    <!--<task:scheduled-tasks>-->
-        <!--<task:scheduled ref="autoCalculateFlow" method="run" cron="0 0 7 * * ?"/>-->
-        <!--<task:scheduled ref="exportReportTask" method="run" cron="0 */2 * * * ?"/>-->
-    <!--</task:scheduled-tasks>-->
+    <task:scheduled-tasks>
+        <task:scheduled ref="autoCalculateFlow" method="run" cron="0 0 7 * * ?"/>
+        <task:scheduled ref="exportReportTask" method="run" cron="0 */2 * * * ?"/>
+    </task:scheduled-tasks>
 </beans>