Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
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
openSource
apollo
Commits
5ae8d214
Commit
5ae8d214
authored
Feb 21, 2017
by
Jason Song
Committed by
GitHub
Feb 21, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #549 from lepdou/hermes
fix npe
parents
dcce97bc
82c86f32
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
CtripMQService.java
...rip/framework/apollo/portal/spi/ctrip/CtripMQService.java
+4
-7
No files found.
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ctrip/CtripMQService.java
View file @
5ae8d214
...
...
@@ -2,7 +2,6 @@ package com.ctrip.framework.apollo.portal.spi.ctrip;
import
com.google.gson.Gson
;
import
com.ctrip.framework.apollo.common.dto.ReleaseDTO
;
import
com.ctrip.framework.apollo.common.entity.App
;
import
com.ctrip.framework.apollo.core.enums.Env
;
import
com.ctrip.framework.apollo.portal.component.config.PortalConfig
;
...
...
@@ -81,12 +80,10 @@ public class CtripMQService implements MQService {
App
app
=
appService
.
load
(
appId
);
msg
.
setInfluence_bu
(
app
.
getOrgName
());
msg
.
setAppid
(
appId
);
ReleaseDTO
release
=
releaseService
.
findReleaseById
(
env
,
releaseHistory
.
getReleaseId
());
msg
.
setAssginee
(
release
.
getDataChangeCreatedBy
());
msg
.
setDesc
(
gson
.
toJson
(
releaseService
.
compare
(
env
,
releaseHistory
.
getPreviousReleaseId
(),
releaseHistory
.
getReleaseId
())));
msg
.
setOperation_time
(
TIMESTAMP_FORMAT
.
format
(
release
.
getDataChangeCreatedTime
()));
msg
.
setAssginee
(
releaseHistory
.
getOperator
());
msg
.
setOperation_time
(
TIMESTAMP_FORMAT
.
format
(
releaseHistory
.
getReleaseTime
()));
msg
.
setDesc
(
gson
.
toJson
(
releaseService
.
compare
(
env
,
releaseHistory
.
getPreviousReleaseId
(),
releaseHistory
.
getReleaseId
())));
return
msg
;
}
...
...
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