Commits · 338a75e21965143e521f74a908b8ccac122f9ca5 · head_group / xyqb-user2

28 Nov, 2017 5 commits
- 规范日志前缀 · 338a75e2
  技术部-任文超 authored Nov 28, 2017
  
  338a75e2
- Merge branch 'master' of http://git.quantgroup.cn/head_group/xyqb-user2 · 0656edcf
  技术部-任文超 authored Nov 28, 2017
  
  0656edcf
- 完成在原有锁定、解锁指定IP基础上，增加黑白名单、Redis可选lock参数（针对撞库攻击）可配置的功能 · 6b945e53
  技术部-任文超 authored Nov 28, 2017
```
优化RequestFilter的公共资源地址空间配置，清除重复项
```
  6b945e53
- Merge branch 'master' into 20171127_remove_channelIdInterceptor · bae2a1c5
  Java—KA—李青 authored Nov 28, 2017
  
  bae2a1c5
- 删除channelIdInterceptor · bc3a341f
  Java—KA—李青 authored Nov 28, 2017
  
  bc3a341f
27 Nov, 2017 4 commits
- 消除验证码错误记次冗余方法（测试环境即存在，未测出来）应是5次失效，实际是3次失效，现统一为3次失效 · 39b1973c
  技术部-任文超 authored Nov 27, 2017
  
  39b1973c
- 回归到merge前代码版本后，重新整合成功（本地简单测试登录服务OK） · 92205ca3
  技术部-任文超 authored Nov 27, 2017
  
  92205ca3
- 找回merge后丢失的常量 · 0938421b
  技术部-任文超 authored Nov 27, 2017
  
  0938421b
- Merge branch 'master' into feature/20171030 · c8058658
  技术部-任文超 authored Nov 27, 2017
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
#	src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java
```
  c8058658
25 Nov, 2017 6 commits
- 补全信息 · f5a3d56f
  Java—红包—徐然 authored Nov 25, 2017
  
  f5a3d56f
- 密码登陆成功后增加日志 · 15d14643
  Java—红包—徐然 authored Nov 25, 2017
  
  15d14643
- 添加几个常量 · ea627691
  任文超 authored Nov 25, 2017
  
  ea627691
- ip限制次数修改 · c74d7d7d
  richard authored Nov 25, 2017
  
  c74d7d7d
- 删除不用的依赖 · c2c09f68
  richard authored Nov 25, 2017
  
  c2c09f68
- 修改ip拦截策略 · 389c9022
  richard authored Nov 25, 2017
  
  389c9022
24 Nov, 2017 15 commits
- 完成升级，兼容高密、低密级加、解锁操作 · 3da06fe4
  技术部-任文超 authored Nov 24, 2017
  
  3da06fe4
- 注册为公共资源 · fe69e3a3
  技术部-任文超 authored Nov 24, 2017
  
  fe69e3a3
- 简化版 · 68f7171a
  技术部-任文超 authored Nov 24, 2017
  
  68f7171a
- 完成加锁/解锁/秘钥生成工具类 · 08f2d3ae
  技术部-任文超 authored Nov 24, 2017
  
  08f2d3ae
- 重构方法 · 37533248
  技术部-任文超 authored Nov 24, 2017
  
  37533248
- 锁定时长调整为30分钟 · 1094ea89
  技术部-任文超 authored Nov 24, 2017
  
  1094ea89
- Merge branch 'master' into feature/20171030 · 06a04a63
  技术部-任文超 authored Nov 24, 2017
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
#	src/main/java/cn/quantgroup/xyqb/aspect/captcha/PasswordErrorFiniteValidateAdvisor.java
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
#	src/main/java/cn/quantgroup/xyqb/util/ValidationUtil.java
```
  06a04a63
- 阈值调整至 200次/分钟 · 92d23e69
  技术部-任文超 authored Nov 24, 2017
  
  92d23e69
- 调整阈值到100次/分钟 · 65b6a27b
  技术部-任文超 authored Nov 24, 2017
  
  65b6a27b
- 全天候开放监控，防止撞库 · b446e363
  技术部-任文超 authored Nov 24, 2017
  
  b446e363
- 开启全天候拦截（取消危险期标记，全天都是危险期） · 65c2b000
  技术部-任文超 authored Nov 24, 2017
  
  65c2b000
- 合并Master-20171123上线分支的代码 · a1f894a1
  技术部-任文超 authored Nov 24, 2017
  
  a1f894a1
- 对未注册用户加账密校验计数器 · 6468f0ba
  技术部-任文超 authored Nov 24, 2017
  
  6468f0ba
- 添加log · 22b6919c
  技术部-任文超 authored Nov 24, 2017
  
  22b6919c
- 添加Log · 9081d3a2
  技术部-任文超 authored Nov 24, 2017
  
  9081d3a2
23 Nov, 2017 10 commits
- 修改增加日志 · 5b672d04
  Java—红包—徐然 authored Nov 23, 2017
  
  5b672d04
- 清除log · d498c249
  技术部-任文超 authored Nov 23, 2017
  
  d498c249
- 补充危险期log，恢复阈值设定 · c1880e95
  技术部-任文超 authored Nov 23, 2017
  
  c1880e95
- 追加Header参数容错代码 · 14bec929
  技术部-任文超 authored Nov 23, 2017
  
  14bec929
- 测试环境配置，上线前需要回滚上一版本 · 8d4bda4e
  技术部-任文超 authored Nov 23, 2017
  
  8d4bda4e
- 修正正则 · c2a96a4d
  技术部-任文超 authored Nov 23, 2017
  
  c2a96a4d
- Merge branch 'feature/20171123-4-user.login' of... · 48220509
  Java—红包—徐然 authored Nov 23, 2017
```
Merge branch 'feature/20171123-4-user.login' of http://git.quantgroup.cn/head_group/xyqb-user2 into feature/20171123-4-user.login
```
  48220509
- 补充22~06点的危险时期识别 · 523ce5b3
  技术部-任文超 authored Nov 23, 2017
  
  523ce5b3
- 修改名字 · 6d19673f
  Java—红包—徐然 authored Nov 23, 2017
  
  6d19673f
- 优化代码，完善锁定策略，阈值设为：1分钟60次，锁定6小时 · f232a9aa
  技术部-任文超 authored Nov 23, 2017
  
  f232a9aa