From b28a9d37428806d17ff1c9b3739324700d9f219e Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Thu, 23 Jun 2022 22:30:46 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0-img:=20=E4=BF=AE=E6=AD=A3=E8=89=BA?= =?UTF-8?q?=E6=9C=AF=E5=AE=B6=E5=88=86=E9=A1=B5=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bnyer/img/controller/CreatorController.java | 13 ++++++++----- .../{SignService.java => SignController.java} | 2 +- .../main/java/com/bnyer/img/dto/NoticePageDto.java | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) rename bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/{SignService.java => SignController.java} (89%) diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java index c48bc4c..418eda3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java @@ -43,12 +43,15 @@ public class CreatorController extends BaseController { } PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); List creators = creatorService.queryPage(dto); - for (Creator creator : creators) { - if(creator != null){ - if(StringUtils.isNotBlank(creator.getPhone())){ - creator.setPhone(Sm4Util.sm4Decrypt(creator.getPhone())); + if(creators.size() > 0){ + for (Creator creator : creators) { + if(creator != null){ + if(StringUtils.isNotBlank(creator.getPhone())){ + creator.setPhone(Sm4Util.sm4Decrypt(creator.getPhone())); + } + //暂时注释掉openId解密校验 + //creator.setOpenId(Sm4Util.sm4Decrypt(creator.getOpenId())); } - creator.setOpenId(Sm4Util.sm4Decrypt(creator.getOpenId())); } } return getDataTable(creators); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignController.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignService.java rename to bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignController.java index b378d0e..07cc83d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignController.java @@ -10,5 +10,5 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/img/sign") @Slf4j -public class SignService extends BaseController { +public class SignController extends BaseController { } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticePageDto.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticePageDto.java index b49ae51..4adc194 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticePageDto.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticePageDto.java @@ -10,7 +10,7 @@ import lombok.Setter; @ApiModel("notice分页接收类") public class NoticePageDto extends BasePageDto { - @ApiModelProperty(value="banner名称") + @ApiModelProperty(value="标题") private String title; @ApiModelProperty(value="渠道")