Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
dc93bfa8
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dc93bfa8
编写于
7月 22, 2014
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix batch insert bug
上级
718c994b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
78 addition
and
33 deletion
+78
-33
cat-broker/pom.xml
cat-broker/pom.xml
+0
-16
cat-broker/src/main/java/com/dianping/cat/broker/api/app/BucketHandler.java
...n/java/com/dianping/cat/broker/api/app/BucketHandler.java
+8
-1
cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java
.../java/com/dianping/cat/broker/api/page/batch/Handler.java
+2
-2
cat-broker/src/main/resources/config/default-app-config.xml
cat-broker/src/main/resources/config/default-app-config.xml
+65
-0
cat-core/pom.xml
cat-core/pom.xml
+1
-1
cat-core/src/main/java/com/dianping/cat/config/app/QueryEntity.java
...rc/main/java/com/dianping/cat/config/app/QueryEntity.java
+2
-8
cat-home/pom.xml
cat-home/pom.xml
+0
-5
未找到文件。
cat-broker/pom.xml
浏览文件 @
dc93bfa8
...
@@ -10,17 +10,6 @@
...
@@ -10,17 +10,6 @@
<name>
broker-service
</name>
<name>
broker-service
</name>
<packaging>
war
</packaging>
<packaging>
war
</packaging>
<dependencies>
<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>
<dependency>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
cat-core
</artifactId>
<artifactId>
cat-core
</artifactId>
...
@@ -87,11 +76,6 @@
...
@@ -87,11 +76,6 @@
<version>
2.0.4
</version>
<version>
2.0.4
</version>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
org.unidal.framework
</groupId>
<artifactId>
dal-jdbc
</artifactId>
<version>
2.0.4
</version>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.commons
</groupId>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-email
</artifactId>
<artifactId>
commons-email
</artifactId>
...
...
cat-broker/src/main/java/com/dianping/cat/broker/api/app/BucketHandler.java
浏览文件 @
dc93bfa8
...
@@ -75,7 +75,14 @@ public class BucketHandler implements Task {
...
@@ -75,7 +75,14 @@ public class BucketHandler implements Task {
private
void
batchInsert
(
List
<
AppDataCommand
>
appDataCommands
)
{
private
void
batchInsert
(
List
<
AppDataCommand
>
appDataCommands
)
{
try
{
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
)
{
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
Cat
.
logError
(
e
);
}
}
...
...
cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java
浏览文件 @
dc93bfa8
...
@@ -66,9 +66,9 @@ public class Handler implements PageHandler<Context>, LogEnabled {
...
@@ -66,9 +66,9 @@ public class Handler implements PageHandler<Context>, LogEnabled {
String
version
=
payload
.
getVersion
();
String
version
=
payload
.
getVersion
();
if
(
userIp
!=
null
)
{
if
(
userIp
!=
null
)
{
if
(
version
.
equals
(
"1"
))
{
if
(
"1"
.
equals
(
version
))
{
processVersion1
(
payload
,
request
,
userIp
);
processVersion1
(
payload
,
request
,
userIp
);
}
else
if
(
version
.
equals
(
"2"
))
{
}
else
if
(
"2"
.
equals
(
version
))
{
processVersion2
(
payload
,
request
,
userIp
);
processVersion2
(
payload
,
request
,
userIp
);
}
}
}
else
{
}
else
{
...
...
cat-broker/src/main/resources/config/default-app-config.xml
0 → 100644
浏览文件 @
dc93bfa8
<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
浏览文件 @
dc93bfa8
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<dependency>
<dependency>
<groupId>
org.unidal.framework
</groupId>
<groupId>
org.unidal.framework
</groupId>
<artifactId>
foundation-service
</artifactId>
<artifactId>
foundation-service
</artifactId>
<version>
2.0.
4
</version>
<version>
2.0.
5
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.unidal.webres
</groupId>
<groupId>
org.unidal.webres
</groupId>
...
...
cat-core/src/main/java/com/dianping/cat/config/app/QueryEntity.java
浏览文件 @
dc93bfa8
package
com.dianping.cat.config.app
;
package
com.dianping.cat.config.app
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -42,7 +41,7 @@ public class QueryEntity {
...
@@ -42,7 +41,7 @@ public class QueryEntity {
m_platfrom
=
parseValue
(
strs
[
6
]);
m_platfrom
=
parseValue
(
strs
[
6
]);
m_city
=
parseValue
(
strs
[
7
]);
m_city
=
parseValue
(
strs
[
7
]);
m_operator
=
parseValue
(
strs
[
8
]);
m_operator
=
parseValue
(
strs
[
8
]);
}
catch
(
Parse
Exception
e
)
{
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
Cat
.
logError
(
e
);
}
}
}
}
...
@@ -51,13 +50,8 @@ public class QueryEntity {
...
@@ -51,13 +50,8 @@ public class QueryEntity {
if
(
StringUtils
.
isEmpty
(
str
))
{
if
(
StringUtils
.
isEmpty
(
str
))
{
return
-
1
;
return
-
1
;
}
else
{
}
else
{
try
{
return
Integer
.
parseInt
(
str
);
return
Integer
.
parseInt
(
str
);
}
catch
(
NumberFormatException
e
)
{
Cat
.
logError
(
e
);
}
}
}
return
-
1
;
}
}
public
Date
getDate
()
{
public
Date
getDate
()
{
...
...
cat-home/pom.xml
浏览文件 @
dc93bfa8
...
@@ -17,11 +17,6 @@
...
@@ -17,11 +17,6 @@
<version>
1.2.1
</version>
<version>
1.2.1
</version>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
org.unidal.framework
</groupId>
<artifactId>
foundation-service
</artifactId>
<version>
2.0.5
</version>
</dependency>
<dependency>
<dependency>
<groupId>
com.dianping.cat
</groupId>
<groupId>
com.dianping.cat
</groupId>
<artifactId>
cat-consumer
</artifactId>
<artifactId>
cat-consumer
</artifactId>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录