Commits · 2837221da86c0aa666b40e9e3aa1183b62e06c81 · openSource / apollo

13 Jun, 2016 5 commits
- support server config separated by cluster · 2837221d
  Jason Song authored Jun 13, 2016
  
  2837221d
- Merge pull request #262 from nobodyiam/adminservice-delete · f1b91928
  张乐 authored Jun 13, 2016
```
fix admin service soft delete
```
  f1b91928
- fix admin service soft delete · 49832e6c
  Jason Song authored Jun 13, 2016
  
  49832e6c
- Merge pull request #261 from nobodyiam/portal-permission-merge · 4f69747e
  张乐 authored Jun 13, 2016
```
Portal user role permission service
```
  4f69747e
- add user role related entity, repository and service and rename username to userId · d292642d
  Jason Song authored Jun 13, 2016
  
  d292642d
12 Jun, 2016 6 commits
- Merge pull request #260 from lepdou/0613_17 · 14992507
  张乐 authored Jun 12, 2016
```
bugfix
```
  14992507
- bugfix · 96c2bcf5
  lepdou authored Jun 12, 2016
  
  96c2bcf5
- Merge pull request #259 from lepdou/0613_17 · 8463c359
  Jason Song authored Jun 12, 2016
```
diff show deleted item & clogging
```
  8463c359
- update · be9385c8
  lepdou authored Jun 12, 2016
  
  be9385c8
- update · 0fb517a2
  lepdou authored Jun 12, 2016
  
  0fb517a2
- diff show deleted item & clogging · 7e7a7959
  lepdou authored Jun 12, 2016
  
  7e7a7959
08 Jun, 2016 9 commits
- Merge pull request #258 from nobodyiam/client-app-id-not-set · 76bd56d9
  张乐 authored Jun 08, 2016
```
prevent crash when app.id is not set
```
  76bd56d9
- prevent crash when app.id is not set · 8737d49c
  Jason Song authored Jun 08, 2016
  
  8737d49c
- Merge pull request #257 from nobodyiam/client-refactor-misc · a0bee9d4
  Jason Song authored Jun 08, 2016
```
misc change
```
  a0bee9d4
- misc change · e636c8ea
  Jason Song authored Jun 08, 2016
  
  e636c8ea
- Merge pull request #256 from nobodyiam/fix-deploy-jenkins · 03a5783a
  张乐 authored Jun 08, 2016
```
tell jenkins to not kill any new process
```
  03a5783a
- tell jenkins to not kill any new process · bfbad2b8
  Jason Song authored Jun 08, 2016
  
  bfbad2b8
- Merge pull request #255 from nobodyiam/fix-deploy-jenkins · fa3524ea
  Jason Song authored Jun 08, 2016
```
remove wait
```
  fa3524ea
- remove wait · a1e0e98d
  Jason Song authored Jun 08, 2016
  
  a1e0e98d
- Merge pull request #254 from nobodyiam/startup-faster · eb9ebe25
  张乐 authored Jun 08, 2016
```
improve startup performance
```
  eb9ebe25
07 Jun, 2016 9 commits
- improve startup performance · 81301469
  Jason Song authored Jun 07, 2016
  
  81301469
- Merge pull request #253 from lepdou/remove_user · ccc4b1bb
  lepdou authored Jun 07, 2016
```
fix datachange create by
```
  ccc4b1bb
- fix datachange create by · bc9aa725
  lepdou authored Jun 07, 2016
  
  bc9aa725
- Merge pull request #252 from lepdou/remove_user · 266f4d89
  Jason Song authored Jun 07, 2016
```
createBy lastUpdateBy 通过dto传递
```
  266f4d89
- Merge pull request #251 from nobodyiam/client-refactor-merge · 4f7ecce2
  lepdou authored Jun 07, 2016
```
refactor according to code review comments
```
  4f7ecce2
- update · f6ef8198
  lepdou authored Jun 07, 2016
  
  f6ef8198
- update · 4ee4598c
  lepdou authored Jun 07, 2016
  
  4ee4598c
- refactor according to code review comments · d47d0f83
  Jason Song authored Jun 07, 2016
  
  d47d0f83
- 用户信息通过dto传递 · ea20fad0
  lepdou authored Jun 07, 2016
  
  ea20fad0
03 Jun, 2016 11 commits
- Merge pull request #250 from nobodyiam/portal-memory · 51d510ad
  Jason Song authored Jun 03, 2016
```
reduce portal memeory size
```
  51d510ad
- reduce portal memeory size · 1f85d7cf
  Jason Song authored Jun 03, 2016
  
  1f85d7cf
- Merge pull request #249 from lepdou/adminservicecache · be118512
  lepdou authored Jun 03, 2016
```
细节优化
```
  be118512
- 细节优化 · 4c015ec4
  lepdou authored Jun 03, 2016
  
  4c015ec4
- Merge pull request #248 from nobodyiam/shorten-startup-timeout · 8639abd0
  Jason Song authored Jun 03, 2016
```
change timeout to 80 seconds
```
  8639abd0
- change timeout to 80 seconds · 08d0e320
  Jason Song authored Jun 03, 2016
  
  08d0e320
- Merge pull request #247 from nobodyiam/fix-startup-script · c555331d
  Jason Song authored Jun 03, 2016
```
move back common startup logic
```
  c555331d
- move back common startup logic · 36cdfda0
  Jason Song authored Jun 03, 2016
  
  36cdfda0
- Merge pull request #246 from lepdou/restructure · 7c2c539d
  Jason Song authored Jun 03, 2016
```
sso相关代码重构
```
  7c2c539d
- update · f3c7ccd3
  lepdou authored Jun 03, 2016
  
  f3c7ccd3
- Merge pull request #245 from nobodyiam/startup-script-merge · a779c281
  lepdou authored Jun 03, 2016
```
Refactor startup logic to wait until server is fully startup
```
  a779c281