|
|
@@ -17,6 +17,7 @@ import com.uas.sso.logging.RegisterBufferedLogger;
|
|
|
import com.uas.sso.service.AppService;
|
|
|
import com.uas.sso.service.PersonalAccountService;
|
|
|
import com.uas.sso.service.UserService;
|
|
|
+import com.uas.sso.util.IpUtils;
|
|
|
import com.uas.sso.util.PasswordLevelUtils;
|
|
|
import com.uas.sso.foreign.weixin.entity.OAuthInfo;
|
|
|
import org.slf4j.Logger;
|
|
|
@@ -29,6 +30,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
+import java.io.UnsupportedEncodingException;
|
|
|
+import java.net.URLDecoder;
|
|
|
+import java.net.URLEncoder;
|
|
|
import java.util.List;
|
|
|
import java.util.Optional;
|
|
|
|
|
|
@@ -66,7 +70,7 @@ public class PersonalRegisterController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public ModelMap register(User user, String appId, String code, String token, String baseUrl, String t) {
|
|
|
+ public ModelMap register(User user, String appId, String code, String token, String baseUrl, String t, String returnUrl) throws UnsupportedEncodingException {
|
|
|
// 获取参数
|
|
|
String vipName = user.getVipName();
|
|
|
String mobile = user.getMobile();
|
|
|
@@ -107,6 +111,8 @@ public class PersonalRegisterController extends BaseController {
|
|
|
|
|
|
// 注册并添加注册日志
|
|
|
appId = StringUtils.isEmpty(appId) ? "sso" : appId;
|
|
|
+ user.setFromIp(IpUtils.getIp(request));
|
|
|
+ user.setFromUrl(URLDecoder.decode(returnUrl, "utf-8"));
|
|
|
user = userService.register(user, appId);
|
|
|
registerLogger.info(Type.REGISTER_PERSONAL.getValue(), Step.FIRST.getValue(), "个人注册成功", user, user.getFromApp());
|
|
|
|