Merge branch 'dev' of https://github.com/roncoo/roncoo-education

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/common/bo/UserRegisterBO.java

@@ -3,12 +3,12 @@
  */
 package com.roncoo.education.user.common.bo;
 
-import java.io.Serializable;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 用户基本信息
@@ -48,6 +48,10 @@ public class UserRegisterBO implements Serializable {
 	@ApiModelProperty(value = "手机验证码", required = true)
 	private String code;
 
+    @ApiModelProperty(value = "ip地址")
 	private String ip;
 
+    @ApiModelProperty(value = "注册来源", hidden = true)
+    private Integer source = 2;
+
 }

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/api/biz/ApiUserInfoBiz.java

 package com.roncoo.education.user.service.api.biz;
 
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
 import com.aliyuncs.exceptions.ClientException;
-import com.roncoo.education.system.feign.vo.SysVO;
 import com.roncoo.education.system.feign.interfaces.IFeignSys;
+import com.roncoo.education.system.feign.vo.SysVO;
 import com.roncoo.education.user.common.bo.UserLoginCodeBO;
 import com.roncoo.education.user.common.bo.UserLoginPasswordBO;
 import com.roncoo.education.user.common.bo.UserRegisterBO;
 import com.roncoo.education.user.common.bo.UserSendCodeBO;
 import com.roncoo.education.user.common.bo.auth.UserUpdateBO;
 import com.roncoo.education.user.common.dto.UserLoginDTO;
-import com.roncoo.education.user.service.dao.PlatformDao;
-import com.roncoo.education.user.service.dao.SendSmsLogDao;
-import com.roncoo.education.user.service.dao.UserDao;
-import com.roncoo.education.user.service.dao.UserExtDao;
-import com.roncoo.education.user.service.dao.UserLogLoginDao;
-import com.roncoo.education.user.service.dao.impl.mapper.entity.Platform;
-import com.roncoo.education.user.service.dao.impl.mapper.entity.SendSmsLog;
-import com.roncoo.education.user.service.dao.impl.mapper.entity.User;
-import com.roncoo.education.user.service.dao.impl.mapper.entity.UserExt;
-import com.roncoo.education.user.service.dao.impl.mapper.entity.UserLogLogin;
+import com.roncoo.education.user.service.dao.*;
+import com.roncoo.education.user.service.dao.impl.mapper.entity.*;
 import com.roncoo.education.util.aliyun.Aliyun;
 import com.roncoo.education.util.aliyun.AliyunUtil;
 import com.roncoo.education.util.base.BaseBiz;
 import com.roncoo.education.util.base.BaseException;
 import com.roncoo.education.util.base.Result;
-import com.roncoo.education.util.enums.IsSuccessEnum;
-import com.roncoo.education.util.enums.LoginStatusEnum;
-import com.roncoo.education.util.enums.ResultEnum;
-import com.roncoo.education.util.enums.StatusIdEnum;
-import com.roncoo.education.util.enums.UserTypeEnum;
-import com.roncoo.education.util.tools.BeanUtil;
-import com.roncoo.education.util.tools.Constants;
-import com.roncoo.education.util.tools.JWTUtil;
-import com.roncoo.education.util.tools.NOUtil;
-import com.roncoo.education.util.tools.StrUtil;
+import com.roncoo.education.util.enums.*;
+import com.roncoo.education.util.tools.*;
 import com.xiaoleilu.hutool.crypto.DigestUtil;
+import com.xiaoleilu.hutool.http.HttpUtil;
 import com.xiaoleilu.hutool.util.ObjectUtil;
 import com.xiaoleilu.hutool.util.RandomUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 
 /**
  * 用户基本信息
@@ -98,13 +82,13 @@ public class ApiUserInfoBiz extends BaseBiz {
 		}
 
 		// 验证码校验
-		String redisSmsCode = redisTemplate.opsForValue().get(platform.getClientId() + userRegisterBO.getMobile());
-		if (StringUtils.isEmpty(redisSmsCode)) {
-			return Result.error("请输入验证码");
-		}
-		if (!redisSmsCode.equals(userRegisterBO.getCode())) {
-			return Result.error("验证码不正确，请重新输入");
-		}
+//		String redisSmsCode = redisTemplate.opsForValue().get(platform.getClientId() + userRegisterBO.getMobile());
+//		if (StringUtils.isEmpty(redisSmsCode)) {
+//			return Result.error("请输入验证码");
+//		}
+//		if (!redisSmsCode.equals(userRegisterBO.getCode())) {
+//			return Result.error("验证码不正确，请重新输入");
+//		}
 
 		// 手机号重复校验
 		User user = userDao.getByMobile(userRegisterBO.getMobile());
@@ -115,6 +99,15 @@ public class ApiUserInfoBiz extends BaseBiz {
 		// 用户注册
 		user = register(userRegisterBO.getMobile(), userRegisterBO.getPassword(), platform.getClientId());
 
+        // 同步数据到演示环境
+        try {
+            String post = HttpUtil.post("https://demo.edu.roncoo.net/gateway/user/api/user/register", JSONUtil.toJSONString(userRegisterBO));
+            logger.warn("-----------------同步注册" + post);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("同步数据异常:{}", e.getMessage());
+        }
+
 		UserLoginDTO dto = new UserLoginDTO();
 		dto.setUserNo(user.getUserNo());
 		dto.setMobile(user.getMobile());