Commit c2f1f85b authored by 李健华's avatar 李健华

Merge branch 'feature/login_rish_done-2022-03-16' into 'master'

去掉登陆策略限制

See merge request !50
parents b6808b8e ee667dfa
...@@ -134,7 +134,7 @@ public class LoginInterceptorAspect { ...@@ -134,7 +134,7 @@ public class LoginInterceptorAspect {
*/ */
sendEvent(UserLoginRegEvent.SubEventType.user_attempt_login, device, phone, deviceId, realIp, null, tenantId); sendEvent(UserLoginRegEvent.SubEventType.user_attempt_login, device, phone, deviceId, realIp, null, tenantId);
LoginRefuseResult result = verification(scDeviceId, phone, device, tenantId); LoginRefuseResult result = verification(deviceId, phone, device, tenantId);
Object loginResult = null; Object loginResult = null;
try { try {
......
...@@ -112,7 +112,6 @@ public class UserController implements IBaseController { ...@@ -112,7 +112,6 @@ public class UserController implements IBaseController {
* @return * @return
* @yapi unknown * @yapi unknown
*/ */
@LoginInterceptor
@CaptchaFiniteValidator @CaptchaFiniteValidator
@RequestMapping("/loginV1") @RequestMapping("/loginV1")
public JsonResult loginV1( public JsonResult loginV1(
...@@ -187,7 +186,6 @@ public class UserController implements IBaseController { ...@@ -187,7 +186,6 @@ public class UserController implements IBaseController {
* *
* @yapi http://yapi.quantgroups.com/project/17/interface/api/2066 * @yapi http://yapi.quantgroups.com/project/17/interface/api/2066
*/ */
@LoginInterceptor
@RequestMapping("/login/fast") @RequestMapping("/login/fast")
public JsonResult loginFast( public JsonResult loginFast(
@RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel, @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
......
...@@ -311,7 +311,6 @@ public class AppController implements IBaseController { ...@@ -311,7 +311,6 @@ public class AppController implements IBaseController {
* @return Token和phoneNo * @return Token和phoneNo
* @yapi http://yapi.quantgroups.com/project/17/interface/api/171 * @yapi http://yapi.quantgroups.com/project/17/interface/api/171
*/ */
@LoginInterceptor
@IpValidator @IpValidator
@RequestMapping("/login2") @RequestMapping("/login2")
@ApiOperation(value = "免密登陆, 新手机号不自动注册", notes = "免密登陆, 新手机号不自动注册", httpMethod = "POST") @ApiOperation(value = "免密登陆, 新手机号不自动注册", notes = "免密登陆, 新手机号不自动注册", httpMethod = "POST")
......
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