fix batch insert bug

cat-broker/pom.xml

@@ -10,17 +10,6 @@
    <name>broker-service</name>
    <packaging>war</packaging>
    <dependencies>
-      <dependency>
-         <groupId>org.unidal.eunit</groupId>
-         <artifactId>EunitTestFwk</artifactId>
-         <version>1.2.1</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.unidal.framework</groupId>
-         <artifactId>foundation-service</artifactId>
-         <version>2.0.5</version>
-      </dependency>
       <dependency>
          <groupId>com.dianping.cat</groupId>
          <artifactId>cat-core</artifactId>
@@ -87,11 +76,6 @@
          <version>2.0.4</version>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.unidal.framework</groupId>
-         <artifactId>dal-jdbc</artifactId>
-         <version>2.0.4</version>
-      </dependency>
       <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-email</artifactId>

cat-broker/src/main/java/com/dianping/cat/broker/api/app/BucketHandler.java

@@ -75,7 +75,14 @@ public class BucketHandler implements Task {
 
 	private void batchInsert(List<AppDataCommand> appDataCommands) {
 		try {
-			m_appDataService.insert((AppDataCommand[]) appDataCommands.toArray());
+			int length = appDataCommands.size();
+			AppDataCommand[] array = new AppDataCommand[length];
+
+			for (int i = 0; i < length; i++) {
+				array[i] = appDataCommands.get(i);
+			}
+
+			m_appDataService.insert(array);
 		} catch (Exception e) {
 			Cat.logError(e);
 		}

cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java

@@ -66,9 +66,9 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 		String version = payload.getVersion();
 
 		if (userIp != null) {
-			if (version.equals("1")) {
+			if ("1".equals(version)) {
 				processVersion1(payload, request, userIp);
-			} else if (version.equals("2")) {
+			} else if ("2".equals(version)) {
 				processVersion2(payload, request, userIp);
 			}
 		} else {

cat-broker/src/main/resources/config/default-app-config.xml

+<app-config>
+	<config-item id="网络类型">
+		<item id="1" name="WIFI"></item>
+		<item id="2" name="2G"></item>
+		<item id="3" name="3G"></item>
+		<item id="4" name="4G"></item>
+	</config-item>
+	<config-item id="运营商">
+		<item id="1" name="中国移动"></item>
+		<item id="2" name="中国联通"></item>
+		<item id="3" name="中国电信"></item>
+		<item id="4" name="中国铁通"></item>
+	</config-item>
+	<config-item id="版本">
+		<item id="1" name="1.0"></item>
+		<item id="2" name="1.1"></item>
+	</config-item>
+	<config-item id="平台">
+		<item id="1" name="andriod"></item>
+		<item id="2" name="ios"></item>
+	</config-item>
+	<config-item id="城市">
+		<item id="1" name="上海市"></item>
+		<item id="2" name="安徽省"></item>
+		<item id="3" name="北京市"></item>
+		<item id="4" name="重庆市"></item>
+		<item id="5" name="福建省"></item>
+		<item id="6" name="甘肃省"></item>
+		<item id="7" name="广东省"></item>
+		<item id="8" name="广西壮族自治区"></item>
+		<item id="9" name="贵州省"></item>
+		<item id="10" name="海南省"></item>
+		<item id="11" name="河北省"></item>
+		<item id="12" name="河南省"></item>
+		<item id="13" name="黑龙江省"></item>
+		<item id="14" name="湖北省"></item>
+		<item id="15" name="湖南省"></item>
+		<item id="16" name="吉林省"></item>
+		<item id="17" name="江苏省"></item>
+		<item id="18" name="江西省"></item>
+		<item id="19" name="辽宁省"></item>
+		<item id="20" name="内蒙古自治区"></item>
+		<item id="21" name="宁夏回族自治区"></item>
+		<item id="22" name="青海省"></item>
+		<item id="23" name="山东省"></item>
+		<item id="24" name="山西省"></item>
+		<item id="25" name="陕西省"></item>
+		<item id="26" name="四川省"></item>
+		<item id="27" name="天津市"></item>
+		<item id="28" name="西藏自治区"></item>
+		<item id="29" name="香港特别行政区"></item>
+		<item id="30" name="新疆维吾尔自治区"></item>
+		<item id="31" name="云南省"></item>
+		<item id="32" name="浙江省"></item>
+	</config-item>
+	<config-item id="连接类型">
+		<item id="1" name="长连接"></item>
+		<item id="2" name="短连接"></item>
+	</config-item>
+	<command id="1" name="http://www.dianping.com/">
+		 <code id="1" name="成功返回" status="0"></code>
+		 <code id="2" name="参数错误" status="1"></code>
+		 <code id="3" name="非常字符" status="1"></code>
+	</command>
+</app-config>
\ No newline at end of file

cat-core/pom.xml

@@ -17,7 +17,7 @@
       <dependency>
          <groupId>org.unidal.framework</groupId>
          <artifactId>foundation-service</artifactId>
-         <version>2.0.4</version>
+         <version>2.0.5</version>
       </dependency>
       <dependency>
          <groupId>org.unidal.webres</groupId>

cat-core/src/main/java/com/dianping/cat/config/app/QueryEntity.java

 package com.dianping.cat.config.app;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -42,7 +41,7 @@ public class QueryEntity {
 			m_platfrom = parseValue(strs[6]);
 			m_city = parseValue(strs[7]);
 			m_operator = parseValue(strs[8]);
-		} catch (ParseException e) {
+		} catch (Exception e) {
 			Cat.logError(e);
 		}
 	}
@@ -51,13 +50,8 @@ public class QueryEntity {
 		if (StringUtils.isEmpty(str)) {
 			return -1;
 		} else {
-			try {
-				return Integer.parseInt(str);
-			} catch (NumberFormatException e) {
-				Cat.logError(e);
-			}
+			return Integer.parseInt(str);
 		}
-		return -1;
 	}
 
 	public Date getDate() {

cat-home/pom.xml

@@ -17,11 +17,6 @@
 			<version>1.2.1</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.unidal.framework</groupId>
-			<artifactId>foundation-service</artifactId>
-			<version>2.0.5</version>
-		</dependency>
 		<dependency>
 			<groupId>com.dianping.cat</groupId>
 			<artifactId>cat-consumer</artifactId>