From d185b548f7a45209b331efc48547eea5d68ef4fd Mon Sep 17 00:00:00 2001 From: zypy333 Date: Fri, 8 Jul 2022 03:57:53 +0000 Subject: [PATCH 1/4] =?UTF-8?q?update=20framework/src/main/java/cn/lili/mo?= =?UTF-8?q?dules/sms/impl/SmsUtilAliImplService.java.=20=E6=8A=9B=E5=87=BA?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A0=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java index f54982e2..4ade384c 100644 --- a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java @@ -156,6 +156,9 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { .setTemplateParam(JSONUtil.toJsonStr(param)); try { SendSmsResponse response = client.sendSms(sendSmsRequest); + if (!("OK").equals(response.getBody().getCode())) { + throw new ServiceException(response.getBody().getMessage()); + } } catch (Exception e) { log.error("发送短信错误", e); } From 2c02b816b56d6c979315e8d6bb0ab4bc93b8076c Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 11 Jul 2022 18:52:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=88=86=E9=94=80?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E5=AD=98=E5=82=A8=E5=80=BC=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/distribution/entity/dos/DistributionOrder.java | 3 +++ .../distribution/serviceimpl/DistributionCashServiceImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java index 491a8faf..fc760ac4 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java @@ -50,6 +50,9 @@ public class DistributionOrder extends BaseIdEntity { private String distributionId; @ApiModelProperty(value = "分销员名称") private String distributionName; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "解冻日期") private Date settleCycle; @ApiModelProperty(value = "提成金额") diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index 805fc9db..8f3e18cc 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -73,6 +73,7 @@ public class DistributionCashServiceImpl extends ServiceImpl Date: Mon, 11 Jul 2022 18:53:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?minio=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=97=A0=E6=84=9F=E7=9F=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/plugin/impl/MinioFilePlugin.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/impl/MinioFilePlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/impl/MinioFilePlugin.java index d7f992d7..a6629738 100644 --- a/framework/src/main/java/cn/lili/modules/file/plugin/impl/MinioFilePlugin.java +++ b/framework/src/main/java/cn/lili/modules/file/plugin/impl/MinioFilePlugin.java @@ -1,5 +1,7 @@ package cn.lili.modules.file.plugin.impl; +import cn.lili.common.enums.ResultCode; +import cn.lili.common.exception.ServiceException; import cn.lili.modules.file.entity.enums.OssEnum; import cn.lili.modules.file.plugin.FilePlugin; import cn.lili.modules.system.entity.dto.OssSetting; @@ -62,14 +64,13 @@ public class MinioFilePlugin implements FilePlugin { public String pathUpload(String filePath, String key) { try { return this.inputStreamUpload(new FileInputStream(filePath), key); - } catch (FileNotFoundException e) { - e.printStackTrace(); + } catch (Exception e) { + throw new ServiceException(ResultCode.OSS_DELETE_ERROR, e.getMessage()); } - return null; } @Override - public String inputStreamUpload(InputStream inputStream, String key) { + public String inputStreamUpload(InputStream inputStream, String key) { String bucket = ""; try { MinioClient client = getOssClient(); @@ -80,12 +81,9 @@ public class MinioFilePlugin implements FilePlugin { .contentType("image/png") .build(); client.putObject(putObjectArgs); - } catch (ErrorResponseException e) { - e.printStackTrace(); - return null; } catch (Exception e) { log.error("上传失败2，", e); - return null; + throw new ServiceException(ResultCode.OSS_DELETE_ERROR, e.getMessage()); } //拼接出可访问的url地址 return ossSetting.getM_endpoint() + "/" + bucket + "/" + key; @@ -129,8 +127,10 @@ public class MinioFilePlugin implements FilePlugin { log.info("创建minio桶成功{}", ossSetting.getM_bucketName()); } } catch (Exception e) { - e.printStackTrace(); + //晴空配置 + minioClient = null; log.error("创建[{}]bucket失败", ossSetting.getM_bucketName()); + throw new ServiceException(ResultCode.OSS_DELETE_ERROR, e.getMessage()); } } } From a6f28d67eb7cfe1080220402cad745b41945afc6 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 12 Jul 2022 10:17:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/member/serviceimpl/MemberServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 0126e81f..c7eb0a70 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -15,10 +15,7 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.token.Token; import cn.lili.common.sensitive.SensitiveWordsFilter; -import cn.lili.common.utils.BeanUtil; -import cn.lili.common.utils.CookieUtil; -import cn.lili.common.utils.SnowFlake; -import cn.lili.common.utils.UuidUtils; +import cn.lili.common.utils.*; import cn.lili.common.vo.PageVO; import cn.lili.modules.connect.config.ConnectAuthEnum; import cn.lili.modules.connect.entity.Connect; @@ -405,11 +402,11 @@ public class MemberServiceImpl extends ServiceImpl impleme @Override public Member updateMember(ManagerMemberEditDTO managerMemberEditDTO) { //过滤会员昵称敏感词 - if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(managerMemberEditDTO.getNickName())) { + if (StringUtils.isNotBlank(managerMemberEditDTO.getNickName())) { managerMemberEditDTO.setNickName(SensitiveWordsFilter.filter(managerMemberEditDTO.getNickName())); } //如果密码不为空则加密密码 - if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(managerMemberEditDTO.getPassword())) { + if (StringUtils.isNotBlank(managerMemberEditDTO.getPassword())) { managerMemberEditDTO.setPassword(new BCryptPasswordEncoder().encode(managerMemberEditDTO.getPassword())); } //查询会员信息