From fadc0205de7e28d3e1ff09c9406f8a53549e6a37 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 24 Dec 2018 14:46:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][html=E5=86=85=E5=AE=B9=E8=BD=AC=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCampaignController.java | 4 ---- .../iformall/service/impl/WxCampaignServiceImpl.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java index 659d58eff..60fd37043 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java @@ -12,7 +12,6 @@ import com.iformall.enums.EnumCampaignStatus; import com.iformall.enums.EnumCouponChannelType; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -34,9 +33,6 @@ public class WxCampaignController extends BaseController { @Autowired private WxCampaignService wxCampaignService; - @Autowired - private WxCouponService wxCouponService; - @Autowired private WxCouponChannelService wxCouponChannelService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 7df4b1f07..f662bffeb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -28,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -56,7 +58,15 @@ public class WxCampaignServiceImpl implements WxCampaignService { @Override public WxCampaign getById(Long id) { - return wxCampaignMapper.selectByPrimaryKey(id); + WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(id); + String html = wxCampaign.getHtml(); + try { + html = URLDecoder.decode(html, "utf-8"); + } catch (UnsupportedEncodingException e) { + logger.info("图文内容解码失败"); + } + wxCampaign.setHtml(html); + return wxCampaign; } @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})