Merge branch 'master' of http://git.quantgroup.cn/QA/config_repository

java/credit_league.properties

@@ -21,7 +21,6 @@ credit.redis.defaultExpiration=600
 credit.redis.master.host=redis
 credit.redis.master.port=6379
 credit.redis.master.name=
-credit.redis.password=
 credit.redis.sentinel1.host=
 credit.redis.sentinel1.port=1
 credit.redis.sentinel2.host=

lua-ui/config/h5-ui.js

@@ -2,9 +2,11 @@ var protocal = window.location.protocol;
 var apiHost = protocal + '//mapi.domain.com';
 var xyqbUserUrl = protocal + "//passport.domain.com";
 var xyqbActiveApi = protocal + "//activity.domain.com";
-var activityId = "98";
 var QiNiuHost = protocal + "//ohsx2fi5w.bkt.clouddn.com/";
 var xjdApi= protocal + '//m.domain.com';
+var flowApi= protocal + '//flow.domain.com';
+var activityId = "98";
+
 
 module.exports = {
   api: apiHost,
@@ -12,5 +14,6 @@ module.exports = {
   xyqbActiveApi: xyqbActiveApi,
   xyqbUserUrl: xyqbUserUrl,
   QiNiuHost: QiNiuHost,
-  xjdApi: xjdApi
+  xjdApi: xjdApi,
+	flowApi: flowApi
 }
\ No newline at end of file