Commits · 76d966df46d8d135d7636b4a429673cd737dbf0c · head_group / xyqb-user2 · GitLab

08 Nov, 2017 12 commits
- 修复账密登录bug · 76d966df
  技术部-任文超 authored Nov 08, 2017
  
  76d966df
- 修改拦截 · a06ab5c6
  Java—红包—徐然 authored Nov 08, 2017
  
  a06ab5c6
- 取消注解log（引发了其他切面出现NPE），添加本地logger · 31a20ae9
  技术部-任文超 authored Nov 08, 2017
  
  31a20ae9
- 账密登录验证码添加计数开关，账密错误3次后才要求用户输入图形验证码 · d0b9daac
  技术部-任文超 authored Nov 08, 2017
  
  d0b9daac
- Merge branch 'master' into feature/20171030 · 502c3c50
  技术部-任文超 authored Nov 08, 2017
  
  502c3c50
- 统一优化短信验证码逻辑，使新旧版快速登录的差别只存在于：是否有一次性令牌 · af0f5572
  技术部-任文超 authored Nov 08, 2017
  
  af0f5572
- 恢复旧快速登录接口短信验证码验证逻辑 · 91961fd4
  技术部-任文超 authored Nov 08, 2017
  
  91961fd4
- 短信验证码计数问题修改 · d15021eb
  技术部-任文超 authored Nov 08, 2017
  
  d15021eb
- 打log · d8b3eff5
  技术部-任文超 authored Nov 08, 2017
  
  d8b3eff5
- Merge branch 'feature/20171030' of... · 29be86b0
  技术部-任文超 authored Nov 08, 2017
```
Merge branch 'feature/20171030' of http://gitabc.xyqb.com/head_group/xyqb-user2 into feature/20171030

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
```
  29be86b0
- 给getHeaderParam方法添加失败返回 · becc469f
  技术部-任文超 authored Nov 08, 2017
  
  becc469f
- Merge branch 'master' into 20171106_delete_58jr · b290d05e
  Java—红包—徐然 authored Nov 08, 2017
  
  b290d05e
07 Nov, 2017 15 commits
- 修复代码 · 6fc9be5e
  Java—红包—徐然 authored Nov 07, 2017
  
  6fc9be5e
- 增加日志 · 2667f5d5
  Java—红包—徐然 authored Nov 07, 2017
  
  2667f5d5
- 修改增加日志 · 1abe11b4
  Java—红包—徐然 authored Nov 07, 2017
  
  1abe11b4
- 增加日志 · cd182418
  Java—红包—徐然 authored Nov 07, 2017
  
  cd182418
- 删除无用的配置 · c6232c34
  Java—KA—李青 authored Nov 07, 2017
  
  c6232c34
- 修改过期时间位置 · ad354af8
  Java—红包—徐然 authored Nov 07, 2017
  
  ad354af8
- 增加过期时间 · 2fa19a3e
  Java—红包—徐然 authored Nov 07, 2017
  
  2fa19a3e
- Merge branch '20171106_delete_58jr' of... · 70cfcbef
  Java—KA—李青 authored Nov 07, 2017
```
Merge branch '20171106_delete_58jr' of http://gitabc.xyqb.com/head_group/xyqb-user2 into 20171106_delete_58jr
```
  70cfcbef
- 删除58jr无用配置 · 8e65d0a1
  Java—KA—李青 authored Nov 07, 2017
  
  8e65d0a1
- 修改删除缓存 · 87ec11d1
  Java—红包—徐然 authored Nov 07, 2017
  
  87ec11d1
- 修改 · 6a5d6f17
  Java—红包—徐然 authored Nov 07, 2017
  
  6a5d6f17
- 修改注销删除缓存部分 · 170a6b83
  Java—红包—徐然 authored Nov 07, 2017
  
  170a6b83
- 调整短信验证码失效文案为“验证码失效，请重新获取” · f1bc1f94
  技术部-任文超 authored Nov 07, 2017
  
  f1bc1f94
- 修改注销逻辑 · 155ac9ad
  Java—红包—徐然 authored Nov 07, 2017
  
  155ac9ad
- 修改新的注销逻辑 · 2b4d3b48
  Java—红包—徐然 authored Nov 07, 2017
  
  2b4d3b48
06 Nov, 2017 8 commits
- 调整注册时验证短信验证码与判断用户是否已注册的逻辑顺序 · 2a9c023a
  技术部-任文超 authored Nov 06, 2017
  
  2a9c023a
- 删除58jr相关代码 · 7b1f65a7
  Java—KA—李青 authored Nov 06, 2017
  
  7b1f65a7
- Merge branch 'master' into feature/20171102 · fd11fad2
  Java—KA—李青 authored Nov 06, 2017
  
  fd11fad2
- 在重置密码的地方添加用户是否已存在的验证逻辑，在短信验证码通过验证后，在用户未注册时添加提醒（此处暂不实现快速注册） · 9cda4b10
  技术部-任文超 authored Nov 06, 2017
  
  9cda4b10
- 修改测试环境sms地址 · a247c421
  Java—红包—徐然 authored Nov 06, 2017
  
  a247c421
- 修改测试环境smssdk · 748ce4b9
  Java—红包—徐然 authored Nov 06, 2017
  
  748ce4b9
- session存活时间调短 · 0c0da2c4
  Java—KA—李青 authored Nov 06, 2017
  
  0c0da2c4
- 与H5协商调整One-Time-Token的参数传递方式为param参数方式 · ed0c0115
  技术部-任文超 authored Nov 06, 2017
  
  ed0c0115
03 Nov, 2017 2 commits
- 更新One-Time Token获取策略， · 7f6a40eb
  技术部-任文超 authored Nov 03, 2017
```
优化UserController代码，
重新梳理用户安全问题解决方案的应对方法，
恢复旧接口的行为到分支初始状态
```
  7f6a40eb
- 为获取单次令牌接口添加开放权限 · 072528aa
  技术部-任文超 authored Nov 03, 2017
  
  072528aa
02 Nov, 2017 3 commits
- 提交H5登录入口的TokenOnce测试用例，取消用户注册入口的TokenOnce校验 · 05da424e
  技术部-任文超 authored Nov 02, 2017
  
  05da424e
- 暂时注释掉代码 · 132ec5e9
  Java—红包—徐然 authored Nov 02, 2017
  
  132ec5e9
- 修改代码 · 8a813e40
  Java—红包—徐然 authored Nov 02, 2017
  
  8a813e40