Commits · 3a0216b5382246d15b35532ee750efeadd92f271 · head_group / xyqb-user2

24 May, 2017 1 commit
- 用户、联系人、地址信息入库 · 3a0216b5
  Java-郭京峰 authored May 24, 2017
  
  3a0216b5
23 May, 2017 2 commits
- Merge branch 'motan_rpc' into baitiao_channel · f221d4d8
  Java-郭京峰 authored May 23, 2017
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java
```
  f221d4d8
- Merge remote-tracking branch 'origin/master' into motan_rpc · 95606e4a
  Java-郭京峰 authored May 23, 2017
  
  95606e4a
22 May, 2017 3 commits
- 用户白条渠道验证 · d5805b1b
  Java-刘彧阳 authored May 22, 2017
  
  d5805b1b
- motan 主库查询实现，modifyUserDetail,loginWithUuid · ada70f27
  Java-郭京峰 authored May 22, 2017
  
  ada70f27
- 去掉todo · 390e6e96
  Java-刘彧阳 authored May 22, 2017
  
  390e6e96
19 May, 2017 9 commits
- 添加日志打印 · 82e4a397
  Java-刘彧阳 authored May 19, 2017
  
  82e4a397
- motan 主库查询实现，枚举包结构改动 · 2bd7436d
  Java-郭京峰 authored May 19, 2017
  
  2bd7436d
- 添加日志打印 · 280fdfcd
  Java-刘彧阳 authored May 19, 2017
  
  280fdfcd
- 添加日志打印 · eb24c9b4
  Java-刘彧阳 authored May 19, 2017
  
  eb24c9b4
- 添加日志打印 · 2a4d81d5
  Java-刘彧阳 authored May 19, 2017
  
  2a4d81d5
- 添加日志打印 · 8d22ad98
  Java-刘彧阳 authored May 19, 2017
  
  8d22ad98
- 添加日志打印 · e7579052
  Java-刘彧阳 authored May 19, 2017
  
  e7579052
- 添加日志打印 · 2467e8c5
  Java-刘彧阳 authored May 19, 2017
  
  2467e8c5
- Merge branch 'master' into baitiao_channel · bc45a3e4
  Java-刘彧阳 authored May 19, 2017
```
Conflicts:
	src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java
	src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
```
  bc45a3e4
18 May, 2017 7 commits
- 手机号脱敏 · dc405a32
  Java-刘彧阳 authored May 18, 2017
  
  dc405a32
- 手机号脱敏 · 32ca2335
  Java-刘彧阳 authored May 18, 2017
  
  32ca2335
- Merge branch 'master' into log_without_phone · cab11d26
  Java-刘彧阳 authored May 18, 2017
  
  cab11d26
- 根据用户手机号查用户id接口增加 · b2a9fa67
  Java-刘彧阳 authored May 18, 2017
  
  b2a9fa67
- 根据用户手机号查用户id接口增加 · f1294daa
  Java-刘彧阳 authored May 18, 2017
  
  f1294daa
- 根据用户手机号查用户id接口增加 · 463c78ff
  Java-刘彧阳 authored May 18, 2017
  
  463c78ff
- fix some thing · 9650903b
  Java-刘彧阳 authored May 18, 2017
  
  9650903b
17 May, 2017 1 commit
- fix some thing · abd92e39
  Java-刘彧阳 authored May 17, 2017
  
  abd92e39
16 May, 2017 2 commits
- 记录白条商户注册的渠道号，并在用户登录时和原来的登录信息一起存入redis，基本保持原有数据结构不变 · ecaabda9
  Java-刘彧阳 authored May 16, 2017
  
  ecaabda9
- 记录白条商户注册的渠道号，并在用户登录时和原来的登录信息一起存入redis，基本保持原有数据结构不变 · 86b5cbc0
  Java-刘彧阳 authored May 16, 2017
  
  86b5cbc0
15 May, 2017 8 commits
- 往外吐手机号的日志记录 · dab76508
  Java-刘彧阳 authored May 15, 2017
  
  dab76508
- 往外吐手机号的日志记录 · d313ff8a
  Java-刘彧阳 authored May 15, 2017
  
  d313ff8a
- 往外吐手机号的日志记录 · 9d834a9b
  Java-刘彧阳 authored May 15, 2017
  
  9d834a9b
- Merge branch 'master' into log_without_phone · 65324010
  Java-刘彧阳 authored May 15, 2017
```
Conflicts:
	src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java
	src/test/java/user/TestUserLogin.java
```
  65324010
- 限制批量查询用户的条数，最多500条 · 0c126d5d
  Java-刘彧阳 authored May 15, 2017
  
  0c126d5d
- Merge branch 'master' into uuids · cb6c0c32
  Java-刘彧阳 authored May 15, 2017
  
  cb6c0c32
- 限制批量查询用户的条数，最多500条 · 88bede23
  Java-刘彧阳 authored May 15, 2017
  
  88bede23
- 合并代码 · 5105394e
  minminyan authored May 15, 2017
  
  5105394e
12 May, 2017 1 commit
- 查找慢查询sql调用来源，打印日志 · dfe94022
  Java-刘彧阳 authored May 12, 2017
  
  dfe94022
11 May, 2017 1 commit
- 修改日志打印文字错误 · 0ccb8739
  Java-刘彧阳 authored May 11, 2017
  
  0ccb8739
10 May, 2017 5 commits
- 高仿一个函谷关的登录验证接口的返回，实际已去函谷关验证用户登录了 · b3d99b3e
  Java-刘彧阳 authored May 10, 2017
  
  b3d99b3e
- 高仿一个函谷关的登录验证接口的返回，实际已去函谷关验证用户登录了 · 306949d6
  Java-刘彧阳 authored May 10, 2017
  
  306949d6
- 紧急上线，去掉一个接口过滤器 · 0c2d958e
  ycl authored May 10, 2017
  
  0c2d958e
- 高仿一个函谷关的登录验证接口的返回，实际已去函谷关验证用户登录了 · 6f2be286
  Java-刘彧阳 authored May 10, 2017
  
  6f2be286
- 高仿一个函谷关的登录验证接口的返回，实际已去函谷关验证用户登录了 · 61d1ca3b
  Java-刘彧阳 authored May 10, 2017
  
  61d1ca3b