cookie domain fetch from config file
commit
Merge branch 'master' of https://github.com/guivuikiong/iyiqifei

# By weijunhui
# Via weijunhui
* 'master' of https://github.com/guivuikiong/iyiqifei:
  助飞路线 添加 city_name
  None处理
  None处理
  get改成getOrElse(null)

Conflicts:
	iyiqifei/src/main/java/com/guivuikiong/iyiqifei/service/ActivityUserDataService.scala
commit