Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
saasio
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
saasio
Commits
cc9752dd
Commit
cc9752dd
authored
7 years ago
by
carrieyzzhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cancel log
parent
6c93818c
master
…
20180326_events4track
30921_bugfix
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
ComplicatedEventsServiceImpl.java
.../com/reyun/service/impl/ComplicatedEventsServiceImpl.java
+2
-3
HttpClientUtil.java
src/main/java/com/reyun/util/HttpClientUtil.java
+0
-0
No files found.
src/main/java/com/reyun/service/impl/ComplicatedEventsServiceImpl.java
View file @
cc9752dd
...
@@ -300,7 +300,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
...
@@ -300,7 +300,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
System
.
out
.
println
(
url
);
System
.
out
.
println
(
url
);
try
{
try
{
String
responseStr
=
HttpClientUtil
.
doHttpPostRequest
(
url
,
"trackingio"
,
conditions
);
String
responseStr
=
HttpClientUtil
.
doHttpPostRequest
(
url
,
"trackingio"
,
conditions
);
System
.
out
.
println
(
responseStr
);
ObjectMapper
mapper
=
new
ObjectMapper
();
ObjectMapper
mapper
=
new
ObjectMapper
();
responseJson
=
mapper
.
readValue
(
responseStr
,
Map
.
class
);
responseJson
=
mapper
.
readValue
(
responseStr
,
Map
.
class
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -1034,7 +1033,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
...
@@ -1034,7 +1033,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
Map
<
String
,
String
>
channelMap
=
new
HashMap
<>();
Map
<
String
,
String
>
channelMap
=
new
HashMap
<>();
//group by _cid or group by _campaignid
//group by _cid or group by _campaignid
if
(
groupArray
.
toString
().
contains
(
FIELD_CID
)
||
groupArray
.
toString
().
contains
(
FIELD_CAMPAIGN_ID
))
{
/*
if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
Account account = accountRepository.findOne(accountId);
Account account = accountRepository.findOne(accountId);
try {
try {
String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
...
@@ -1061,7 +1060,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
...
@@ -1061,7 +1060,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
logger.error("fail to get channel or campaign name");
logger.error("fail to get channel or campaign name");
}
}
}
}
*/
//1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)
//1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/reyun/util/HttpClientUtil.java
View file @
cc9752dd
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment