Commit 82c86f32 authored by lepdou's avatar lepdou

fix npe

parent dcce97bc
...@@ -2,7 +2,6 @@ package com.ctrip.framework.apollo.portal.spi.ctrip; ...@@ -2,7 +2,6 @@ package com.ctrip.framework.apollo.portal.spi.ctrip;
import com.google.gson.Gson; 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.common.entity.App;
import com.ctrip.framework.apollo.core.enums.Env; import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.portal.component.config.PortalConfig; import com.ctrip.framework.apollo.portal.component.config.PortalConfig;
...@@ -81,12 +80,10 @@ public class CtripMQService implements MQService { ...@@ -81,12 +80,10 @@ public class CtripMQService implements MQService {
App app = appService.load(appId); App app = appService.load(appId);
msg.setInfluence_bu(app.getOrgName()); msg.setInfluence_bu(app.getOrgName());
msg.setAppid(appId); msg.setAppid(appId);
msg.setAssginee(releaseHistory.getOperator());
ReleaseDTO release = releaseService.findReleaseById(env, releaseHistory.getReleaseId()); msg.setOperation_time(TIMESTAMP_FORMAT.format(releaseHistory.getReleaseTime()));
msg.setAssginee(release.getDataChangeCreatedBy()); msg.setDesc(gson.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(),
msg.setDesc( releaseHistory.getReleaseId())));
gson.toJson(releaseService.compare(env, releaseHistory.getPreviousReleaseId(), releaseHistory.getReleaseId())));
msg.setOperation_time(TIMESTAMP_FORMAT.format(release.getDataChangeCreatedTime()));
return msg; return msg;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment