|
@@ -1,19 +1,5 @@
|
|
|
package com.diagbot.facade;
|
|
|
|
|
|
-import java.io.Serializable;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.cache.annotation.CacheEvict;
|
|
|
-import org.springframework.cache.annotation.CachePut;
|
|
|
-import org.springframework.cache.annotation.Cacheable;
|
|
|
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
|
|
|
-import org.springframework.security.crypto.password.PasswordEncoder;
|
|
|
-import org.springframework.stereotype.Component;
|
|
|
-
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.diagbot.client.AuthServiceClient;
|
|
@@ -35,10 +21,24 @@ import com.diagbot.service.impl.UserServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
+import com.diagbot.util.RegexValidateUtil;
|
|
|
import com.diagbot.util.StringUtil;
|
|
|
import com.diagbot.util.UserUtils;
|
|
|
import com.diagbot.vo.ImgVerVerVO;
|
|
|
import com.diagbot.vo.UserSaveVO;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.cache.annotation.CacheEvict;
|
|
|
+import org.springframework.cache.annotation.CachePut;
|
|
|
+import org.springframework.cache.annotation.Cacheable;
|
|
|
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
|
|
|
+import org.springframework.security.crypto.password.PasswordEncoder;
|
|
|
+import org.springframework.stereotype.Component;
|
|
|
+
|
|
|
+import java.io.Serializable;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* @Description: 用户业务层
|
|
@@ -78,13 +78,17 @@ public class UserFacade extends UserServiceImpl {
|
|
|
if(bean != null) {
|
|
|
throw new CommonException(ServiceErrorCode.USER_EXIST);
|
|
|
}
|
|
|
+ if(!RegexValidateUtil.checkMobileNumber(userSaveVO.getUsername())) {
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入正确的手机号!");
|
|
|
+ }
|
|
|
+
|
|
|
//TODO 测试注释了图形验证和短信验证,后面要开启
|
|
|
// verFacade.verifyImgVerification(imgVerVerVO); //保存时再次校验图形验证码,主要是为了防止跳过前端校验直接调用接口
|
|
|
|
|
|
PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
|
|
|
String entryPassword= passwordEncoder.encode(user.getPassword());
|
|
|
user.setPassword(entryPassword);
|
|
|
-// this.save(user);
|
|
|
+ this.save(user);
|
|
|
|
|
|
// 机构相关业务
|
|
|
doOrganization(userSaveVO, user);
|