Commits · 2ec9fc53469f04a859e890ec9071c05850e0c01e · head_group / xyqb-user2

03 Jan, 2018 2 commits
- Merge branch 'feature/zipkin' into feature/junit_test · 2ec9fc53
  技术部-任文超 authored Jan 03, 2018
  
  2ec9fc53
- Merge branch 'master' into feature/junit_test · d3c72629
  技术部-任文超 authored Jan 03, 2018
  
  d3c72629
29 Dec, 2017 3 commits
- 新版本apollo-client-0.10.1已解决application.properties的参数问题： · baa386f8
  技术部-任文超 authored Dec 29, 2017
```
security.sessions=if_required
spring.aop.proxy-target-class=true
因此删除废弃的配置文件
```
  baa386f8
- 删除废弃的logback.xml文件，改为resources/logback-dev.xml和logback-pro.xml文件 · d501ec34
  技术部-任文超 authored Dec 29, 2017
  
  d501ec34
- 技术升级：confluence 17/12/18-平滑退出&全链路跟踪 · 88b6db71
  技术部-任文超 authored Dec 29, 2017
  
  88b6db71
28 Dec, 2017 2 commits
- 优化代码，防止NPE · 5b298aa8
  技术部-任文超 authored Dec 28, 2017
  
  5b298aa8
- 归并重复代码 · 44c89ead
  技术部-任文超 authored Dec 28, 2017
  
  44c89ead
27 Dec, 2017 1 commit
- no message · 4022e6da
  技术部-任文超 authored Dec 27, 2017
  
  4022e6da
26 Dec, 2017 5 commits
- 补充提交：maven · d36d9c4f
  技术部-任文超 authored Dec 26, 2017
  
  d36d9c4f
- 批量测试实例，jUnit5实例 · 79553c0b
  技术部-任文超 authored Dec 26, 2017
  
  79553c0b
- 修改 · c800cf11
  Java—红包—徐然 authored Dec 26, 2017
  
  c800cf11
- 下线调用函谷关接口：/innerapi/is_login，/innerapi/disableUserCache · 08b42294
  技术部-任文超 authored Dec 26, 2017
  
  08b42294
- Merge branch 'feature/apollo' into feature/junit_test · a86d9332
  Java—红包—徐然 authored Dec 26, 2017
```
# Conflicts:
#	src/main/resources/config/test/logback.xml
```
  a86d9332
25 Dec, 2017 7 commits
- 优化代码，防止Duplicate entry 'user_id' for key 'uni_idx_user_id' · a9c9363c
  技术部-任文超 authored Dec 25, 2017
  
  a9c9363c
- 修复bug：boolean 转 JsonResult · 3e0a3634
  技术部-任文超 authored Dec 25, 2017
  
  3e0a3634
- Merge branch 'master' into feature/apollo · 453b1557
  技术部-任文超 authored Dec 25, 2017
  
  453b1557
- 防止NPE · a58a13fe
  技术部-任文超 authored Dec 25, 2017
  
  a58a13fe
- Merge branch 'master' into feature/apollo · 65fd11d8
  Java—红包—徐然 authored Dec 25, 2017
  
  65fd11d8
- 解决NPE · 15a0887e
  技术部-任文超 authored Dec 25, 2017
  
  15a0887e
- 合并master · 66dd02e6
  Java—红包—徐然 authored Dec 25, 2017
  
  66dd02e6
22 Dec, 2017 2 commits
- 测试模式追加 127.0.0.1 到白名单 · 9f9e5c65
  技术部-任文超 authored Dec 22, 2017
  
  9f9e5c65
- 优化代码，容错，防止NPE · e0a12e0b
  技术部-任文超 authored Dec 22, 2017
  
  e0a12e0b
21 Dec, 2017 18 commits
- 修改 · 2bbdecce
  Java—红包—徐然 authored Dec 21, 2017
  
  2bbdecce
- 修改 · 431c127a
  Java—红包—徐然 authored Dec 21, 2017
  
  431c127a
- xiugai · a3acf53e
  Java—红包—徐然 authored Dec 21, 2017
  
  a3acf53e
- 修改配置 · 637a6a70
  Java—红包—徐然 authored Dec 21, 2017
  
  637a6a70
- 修改配置 · d42bd088
  Java—红包—徐然 authored Dec 21, 2017
  
  d42bd088
- no message · 4370d53d
  Java—红包—徐然 authored Dec 21, 2017
  
  4370d53d
- logback · e2b8bfbe
  Java—红包—徐然 authored Dec 21, 2017
  
  e2b8bfbe
- 修改 · 59042069
  Java—红包—徐然 authored Dec 21, 2017
  
  59042069
- 修改 · 88e9e934
  Java—红包—徐然 authored Dec 21, 2017
  
  88e9e934
- 修改 · 55d654e3
  Java—红包—徐然 authored Dec 21, 2017
  
  55d654e3
- 修改 · 8726cb7f
  Java—红包—徐然 authored Dec 21, 2017
  
  8726cb7f
- 修改 · 8585266b
  Java—红包—徐然 authored Dec 21, 2017
  
  8585266b
- 恢复配置 · b51b4094
  Java—红包—徐然 authored Dec 21, 2017
  
  b51b4094
- 修改 · a54a404a
  Java—红包—徐然 authored Dec 21, 2017
  
  a54a404a
- 修改 · e571431b
  Java—红包—徐然 authored Dec 21, 2017
  
  e571431b
- 修改日志名字 · 304c5135
  Java—红包—徐然 authored Dec 21, 2017
  
  304c5135
- 还原 · 6db735fa
  Java—红包—徐然 authored Dec 21, 2017
  
  6db735fa
- 修改 · b79e5b3c
  Java—红包—徐然 authored Dec 21, 2017
  
  b79e5b3c