From 70131799daf931b783a4df6fb0f115c6e7869694 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Fri, 17 Dec 2021 11:27:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E6=A0=87=E5=A7=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/util/Assert.java | 1 - .../controller/CompanyLoginController.java | 8 +- .../com/jero/data/entity/RegisterSelf.java | 1 - .../impl/PayCaseCommitteeServiceImpl.java | 51 +++-- .../controller/PayMeetingController.java | 180 +++++++++++++++--- 5 files changed, 202 insertions(+), 39 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/Assert.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/Assert.java index 9d9a1c16..9d1775f9 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/Assert.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/Assert.java @@ -112,7 +112,6 @@ public class Assert { * @param s 待检查手机号 */ public static boolean isTel(String s) { - Pattern pattern = Pattern.compile(ConstantUtils.TEL_PHONE); Matcher matcher = pattern.matcher(s); if (!matcher.find()) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 84abb1d0..9409eea3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -365,10 +365,16 @@ public class CompanyLoginController { @GetMapping(value = "/sendVerificationCode") public Result sendVerificationCode(@RequestParam(name="phone") String phone, @RequestParam(name="codeType") String codeType) { + if("3".equals(codeType)) { + sysBaseAPI.sendVerificationCode(phone,codeType,"300",null); + String string = redisUtil.get("_verification:_phone:" + phone).toString(); + return Result.OK(string); + + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayContactsManagement::getPhone, PasswordUtil.encrypt(phone)); PayContactsManagement contactsManagement = payContactsManagementService.getOne(queryWrapper); - if (Objects.isNull(contactsManagement)){ + if (Objects.isNull(contactsManagement)) { throw new JeroBootException("手机号不是企业联系人"); } sysBaseAPI.sendVerificationCode(phone,codeType,"300",null); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/RegisterSelf.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/RegisterSelf.java index 3f5d37a4..ec884304 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/RegisterSelf.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/RegisterSelf.java @@ -11,7 +11,6 @@ public class RegisterSelf { /**手机号*/ @ApiModelProperty(value = "手机号") @NotEmpty(message = "手机号不能为空！") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") private String phone; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java index 0d5a9755..e1e29625 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.Assert; import com.jero.common.util.CommonUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.RedisUtil; @@ -17,9 +18,11 @@ import com.jero.data.mapper.PayCaseCommitteeMapper; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.model.SysLoginVO; import com.jero.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; @@ -74,22 +77,25 @@ public class PayCaseCommitteeServiceImpl extends ServiceImpl50){ + throw new JeroBootException("验证码长度不超过50个字符"); + } + if(ObjectUtils.isEmpty(user.getPassword())){ + throw new JeroBootException("新密码为必填"); + } + if(ObjectUtils.isEmpty(user.getVerifyPassword())){ + throw new JeroBootException("确认密码为必填"); + } + + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 2e651e2e..4da8de6e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -1,23 +1,23 @@ package com.jero.meeting.controller; +import java.io.*; import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.AuthenticationUtils; -import com.jero.common.util.PasswordUtil; -import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; +import com.jero.common.util.*; import com.jero.company.service.IPayContactsManagementService; import com.jero.data.entity.PayCaseCommittee; import com.jero.data.service.IPayCaseCommitteeService; @@ -43,10 +43,12 @@ import com.jero.util.QrcodeUtil; import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.core.env.Environment; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -89,6 +91,12 @@ public class PayMeetingController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.pageListContract(page, payMeeting, request,sysUser); + IPage pageList = payMeetingService.pageListContract(page, payMeeting, request, sysUser); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); @@ -130,7 +138,7 @@ public class PayMeetingController extends JeroController()); @@ -282,7 +289,7 @@ public class PayMeetingController extends JeroController +// if(meetingMinute) +// List meetingMinuteList = Arrays.asList(meetingMinute.split(",")); +// List meetingMinuteList = Arrays.asList(meetingMinute.split(",")); +// // 查询数据表数据是否存在 +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(OSSFile::getId,id); +// OSSFile ossFile = ossFileService.getOne(queryWrapper); +// if( null == ossFile){ +// throw new JeroBootException("文件不存在.."); +// } +// String fileUrl = ossFile.getUrl(); +// InputStream inputStream = null; +// OutputStream outputStream = null; +// try { +// String fileName = ""; +// if(CommonConstant.UPLOAD_TYPE_LOCAL.equals(uploadType)){ +// //本地下载 +// String filePath = uploadpath + File.separator + fileUrl; +// File file = new File(filePath); +// if(!file.exists()){ +// response.setStatus(404); +// throw new RuntimeException("文件不存在.."); +// } +// // 文件名称 +// fileName = file.getName(); +// inputStream = new BufferedInputStream(new FileInputStream(filePath)); +// }else if(CommonConstant.UPLOAD_TYPE_MINIO.equals(uploadType)){ +// // minio 下载 +// // 通过MinioUtil查询时 只需要桶后面的路径 +// String minioUrl = MinioUtil.getMinioUrl(); +// // Linux/unix 系统下文件路径分隔符为"/" 获取minio与存储桶的路径 +// minioUrl = minioUrl + MinioUtil.getBucketName() + "/"; +// String url = fileUrl.replace(minioUrl, ""); +// // 文件名称 +// fileName = ossFile.getFileName(); +// inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url); +// } +// +// ossFileService.updateById(ossFile); +// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// if (loginUser.getIsCompanyUser()) { +// Integer integer = ossFileService.searchDownloadTimes(ossFile.getId(), loginUser.getId()); +// if (integer >= 5) { +// throw new JeroBootException("超出下载次数限制"); +// } +// } +// ossFileService.saveDownloadTimes(ossFile.getId(), loginUser.getId()); +// +// response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1")); +// response.setContentType("application/force-download");// 设置强制下载不打开 +// if (type == null) { +// fileName = StringUtils.lowerCase(fileName); +// if (fileName.contains(".jpg") || fileName.contains(".gif") || fileName.contains(".jpeg")) { +// response.setContentType("image/jpeg;image/jpg;image/gif;image/png"); +// } else if (fileName.contains(".png")) { +// response.setContentType("image/png;image/jpg;image/gif;image/jpeg"); +// } +// } +// outputStream = response.getOutputStream(); +// byte[] buf = new byte[1024]; +// int len; +// while ((len = inputStream.read(buf)) > 0) { +// outputStream.write(buf, 0, len); +// } +// response.flushBuffer(); +// //统计下载和上传次数 +// if ("download".equals(type)) { +// Integer downloadNumber = ossFile.getDownloadNumber(); +// if (downloadNumber == null) { +// ossFile.setDownloadNumber(1); +// } else { +// ossFile.setDownloadNumber(downloadNumber + 1); +// } +// ossFileService.updateById(ossFile); +// } else { +// Integer viewNumber = ossFile.getViewNumber(); +// if (viewNumber == null) { +// ossFile.setViewNumber(1); +// } else { +// ossFile.setViewNumber(viewNumber + 1); +// } +// ossFileService.updateAndPush(ossFile); +// } +// } catch (IOException e) { +// log.error("预览文件失败" + e.getMessage()); +// response.setStatus(404); +// e.printStackTrace(); +// } finally { +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// log.error(e.getMessage(), e); +// } +// } +// if (outputStream != null) { +// try { +// outputStream.close(); +// } catch (IOException e) { +// log.error(e.getMessage(), e); +// } +// } +// } +// + } } +