Commit 88080a68 authored by 刘帅阳's avatar 刘帅阳

修改

parent 6f772c8c
...@@ -338,7 +338,7 @@ public class CmsPriceClickServiceImpl extends ServiceImpl<CmsPriceClickRepositor ...@@ -338,7 +338,7 @@ public class CmsPriceClickServiceImpl extends ServiceImpl<CmsPriceClickRepositor
//手机号 //手机号
addSysUser.setPhone(cmsPriceClickDTO.getPhone()); addSysUser.setPhone(cmsPriceClickDTO.getPhone());
//密码为 身份证号后6为 //密码为 身份证号后6为
addSysUser.setPassword(passwordEncoder.encode(cmsPriceClickDTO.getIdCard().substring(cmsPriceClickDTO.getIdCard().length() - 6))); addSysUser.setPassword(cmsPriceClickDTO.getIdCard().substring(cmsPriceClickDTO.getIdCard().length() - 6));
//身份证号 //身份证号
addSysUser.setIdNumber(cmsPriceClickDTO.getIdCard()); addSysUser.setIdNumber(cmsPriceClickDTO.getIdCard());
addSysUser.setFlag("1"); addSysUser.setFlag("1");
......
...@@ -299,6 +299,16 @@ public class WebsiteCrawlerServiceImpl implements WebsiteCrawlerService { ...@@ -299,6 +299,16 @@ public class WebsiteCrawlerServiceImpl implements WebsiteCrawlerService {
return map; return map;
} }
private static Map<String, String> getPeopleAppCom(Document document) {
Map<String, String> map = new HashMap<>();
String title = document.select("div.title").html();
String content = document.select("body").html();
map.put("title", title);
map.put("content", content);
return map;
}
/** /**
* 开始爬取指定网站数据 * 开始爬取指定网站数据
*/ */
...@@ -372,7 +382,7 @@ public class WebsiteCrawlerServiceImpl implements WebsiteCrawlerService { ...@@ -372,7 +382,7 @@ public class WebsiteCrawlerServiceImpl implements WebsiteCrawlerService {
} }
//通过 title 判断当前文章是否跟数据库有重复 //通过 title 判断当前文章是否跟数据库有重复
String title = cmsNewsService.getNewsByTitleByTitle(map.get("title")); String title = cmsNewsService.getNewsByTitleByTitle(map.get("title"));
if (title == null && map.containsKey(title) && map.containsKey("content")) { if (title == null && map.containsKey("title") && map.containsKey("content")) {
// 图片转换 // 图片转换
Document parse = Jsoup.parse(map.get("content")); Document parse = Jsoup.parse(map.get("content"));
replaceImgSrc(parse); replaceImgSrc(parse);
...@@ -398,16 +408,6 @@ public class WebsiteCrawlerServiceImpl implements WebsiteCrawlerService { ...@@ -398,16 +408,6 @@ public class WebsiteCrawlerServiceImpl implements WebsiteCrawlerService {
} }
private Map<String, String> getPeopleAppCom(Document document) {
Map<String, String> map = new HashMap<>();
String title = document.select("div.title").html();
String content = document.select("body").html();
map.put("title", title);
map.put("content", content);
return map;
}
/** /**
* 图片转换,防止盗链 * 图片转换,防止盗链
* *
......
...@@ -41,6 +41,7 @@ import java.math.BigInteger; ...@@ -41,6 +41,7 @@ import java.math.BigInteger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -85,7 +86,6 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU ...@@ -85,7 +86,6 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU
public CyPersistModel persist(AddSysUser userToAdd) { public CyPersistModel persist(AddSysUser userToAdd) {
SysUser sysUser = baseMapper.checkAddRepeat(userToAdd); SysUser sysUser = baseMapper.checkAddRepeat(userToAdd);
if (null != sysUser) { if (null != sysUser) {
if (StringUtils.isNotEmpty(sysUser.getUsername())) { if (StringUtils.isNotEmpty(sysUser.getUsername())) {
throw new CyServiceException(AdminUserInfoExceptionEnums.USERNAME_EXISTS); throw new CyServiceException(AdminUserInfoExceptionEnums.USERNAME_EXISTS);
} }
...@@ -355,6 +355,7 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU ...@@ -355,6 +355,7 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU
//导入信息校验 //导入信息校验
//剔除对象中的空对象 //剔除对象中的空对象
ArrayList<AddSysUser> list = new ArrayList<>(); ArrayList<AddSysUser> list = new ArrayList<>();
Pattern pattern = Pattern.compile("[0-9]*");
for (AddSysUser user : users) { for (AddSysUser user : users) {
if (StringUtils.isNotEmpty(user.getName()) && StringUtils.isNotEmpty(user.getPhone()) && StringUtils.isNotEmpty(user.getIdNumber())) { if (StringUtils.isNotEmpty(user.getName()) && StringUtils.isNotEmpty(user.getPhone()) && StringUtils.isNotEmpty(user.getIdNumber())) {
//身份证信息判断 长度判断 //身份证信息判断 长度判断
...@@ -378,8 +379,17 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU ...@@ -378,8 +379,17 @@ public class SysUserServiceImpl extends ServiceImpl<AdminSysUserRepository, SysU
throw new CyServiceException(ResultServiceEnums.UPLOAD_ERROR.getCode(), throw new CyServiceException(ResultServiceEnums.UPLOAD_ERROR.getCode(),
"第" + rowIndex + "行,姓名(" + user.getName() + ")不能为空,长度不小于2位且不大于6位。请校验数据并重新导入! "); "第" + rowIndex + "行,姓名(" + user.getName() + ")不能为空,长度不小于2位且不大于6位。请校验数据并重新导入! ");
} }
//手机号只能是数字
if (!pattern.matcher(user.getPhone()).matches()) {
throw new CyServiceException(AdminUserInfoExceptionEnums.PHONE_LENGTH_ERROR.getCode(), AdminUserInfoExceptionEnums.PHONE_LENGTH_ERROR.getMessage());
}
//银行卡号只能是数字
if (!pattern.matcher(user.getBankCardNum()).matches()) {
throw new CyServiceException(AdminUserInfoExceptionEnums.BANK_LENGTH_ERROR.getCode(), AdminUserInfoExceptionEnums.BANK_LENGTH_ERROR.getMessage());
}
list.add(user); list.add(user);
} }
} }
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
throw new CyServiceException(ResultServiceEnums.UPLOAD_ERROR.getCode(), "导入文件为空,请校验导入文档数据!"); throw new CyServiceException(ResultServiceEnums.UPLOAD_ERROR.getCode(), "导入文件为空,请校验导入文档数据!");
......
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