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

java/feature.properties

+/**
+* Created by mengluoyong on 2018/10/18.
+*/
+#feature db connection config
+#data.source.feature.jdbcUrl=jdbc:mysql://192.168.4.163:3306/xyqb_feature?useUnicode=true&characterEncoding=UTF8&useSSL=false
+#data.source.feature.username=qa
+#data.source.feature.password=qatest
+#data.source.feature.maxPoolSize=100
+data.source.feature.jdbcUrl=jdbc:mysql://127.0.0.1:3306/xyqb_feature?useUnicode=true&characterEncoding=UTF8&useSSL=false&statementInterceptors=brave.mysql.TracingStatementInterceptor
+data.source.feature.username=root
+data.source.feature.password=admin
+#data.source.feature.maxPoolSize=10
+#data.source.feature.jdbcUrl=jdbc:mysql://127.0.0.1:3306/xyqb_feature?useUnicode=true&characterEncoding=UTF8&useSSL=false
+#data.source.feature.username=root
+#data.source.feature.password=123456
+data.source.feature.maxPoolSize=10
+
+#model db connection config
+data.source.model.jdbcUrl=jdbc:mysql://xyqb-rule-db.quantgroups.com:6606/xyqb_model?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.model.username=xyqb_rule_read
+data.source.model.password=1q2w3e4r
+data.source.model.maxPoolSize=20
+
+data.source.creditx.jdbcUrl=jdbc:mysql://ti-db.quantgroups.com:4000/creditx_data?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.creditx.username=creditx_r_w
+data.source.creditx.password=0666mkj097y43
+data.source.creditx.maxPoolSize=20
+
+data.source.black.jdbcUrl=jdbc:mysql://172.30.220.16:33310/blacklist3?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.black.username=blacklist3_read
+data.source.black.password=4cbv2AghLmpiSXAm
+data.source.black.maxPoolSize=20
+
+#xyqb db connection config
+data.source.xyqb.jdbcUrl=jdbc:mysql://db:3306/xyqb?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.xyqb.username=qa
+data.source.xyqb.password=qatest
+data.source.xyqb.maxPoolSize=20
+
+#xyqb_app db connection config
+data.source.xyqb_app.jdbcUrl=jdbc:mysql://172.30.220.16:33314/xyqb_app?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.xyqb_app.username=feature_r
+data.source.xyqb_app.password=GjFpyjNOCe5CWYXn
+data.source.xyqb_app.maxPoolSize=20
+
+#lkbadmin db connection config
+data.source.lkbadmin.jdbcUrl=jdbc:mysql://172.30.220.16:33403/lkbadmin?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.lkbadmin.username=lkbadmin_feature_r
+data.source.lkbadmin.password=uij89knb762er4cgs67
+data.source.lkbadmin.maxPoolSize=20
+
+#risk-control db connection config
+data.source.risk.jdbcUrl=jdbc:mysql://172.30.220.16:33309/risk_control?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.risk.username=xyqb_query
+data.source.risk.password=Uiwb@o^fR&nHOa5t
+data.source.risk.maxPoolSize=20
+
+#risk-control db connection config
+data.source.mall.jdbcUrl=jdbc:mysql://172.20.3.47:33307/mall?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.mall.username=drisk_controlpro
+data.source.mall.password=uijk78ytlk953rtg
+data.source.mall.maxPoolSize=20
+
+
+#risk-control db connection config
+#data.source.user.jdbcUrl=jdbc:mysql://db-usercenter.xyqb.com:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8&useSSL=false
+#data.source.user.username=drisk_controlpro
+#data.source.user.password=uijk78ytlk953rtg
+#data.source.user.maxPoolSize=20
+data.source.user.jdbcUrl=jdbc:mysql://db:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.user.username=drisk_controlpro
+data.source.user.password=uijk78ytlk953rtg
+data.source.user.maxPoolSize=20
+
+#monitor db connection config
+data.source.monitor.jdbcUrl=jdbc:mysql://172.30.220.16:3306/monitor?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.monitor.username=qa
+data.source.monitor.password=qatest
+data.source.monitor.maxPoolSize=200
+
+#silkroad db connection config
+data.source.silkroad.jdbcUrl=jdbc:mysql://db:3306/silk_road?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.silkroad.username=qa
+data.source.silkroad.password=qatest
+data.source.silkroad.maxPoolSize=20
+
+#silkroad db connection config
+data.source.silkroadcredit.jdbcUrl=jdbc:mysql://db:3306/silk_road_credit?useUnicode=true&characterEncoding=UTF8&useSSL=false
+data.source.silkroadcredit.username=qa
+data.source.silkroadcredit.password=qatest
+data.source.silkroadcredit.maxPoolSize=20
+
+#operatorspider db connection config
+data.source.operatorspider.jdbcUrl = jdbc:mysql://172.30.220.9:3306/lkb_spider?useUnicode=true&characterEncoding=utf-8&useSSL=false
+data.source.operatorspider.username = qa
+data.source.operatorspider.password = qatest
+data.source.operatorspider.max-pool-size = 20
+
+
+#spider center host config
+xyqb.spider.host=
+
+
+#redis config todo 上线替换
+feature.data.redis.defaultExpiration=3600
+feature.redis.master.host=127.0.0.1
+feature.redis.master.port=6379
+feature.redis.master.name=
+feature.redis.sentinel1.host=
+feature.redis.sentinel1.port=1
+feature.redis.sentinel2.host=
+feature.redis.sentinel2.port=1
+feature.redis.sentinel3.host=
+feature.redis.sentinel3.port=1
+
+
+
+#todo 替换地址
+feature.rabbitmq.connection.host=172.30.220.16
+feature.rabbitmq.connection.port=5672
+feature.rabbitmq.connection.user=qa
+feature.rabbitmq.connection.password=qatest
+feature.rabbitmq.exchange=feature_save
+feature.rabbitmq.feature.calculate.queue=feature_calculate
+feature.rabbitmq.feature.save.queue=feature_save
+feature.rabbitmq.feature.history.queue=feature_history_record
+feature.rabbitmq.feature.event.queue=feature_event
\ No newline at end of file

lua-ui/config/ka-spider-center-ui.js

 var protocal = window.location.protocol
 var apiHost = protocal + '//operator.liangkebang.com'
-var xyqbApiHost = protocal + '//api.domain.com';
+var xyqbApiHost = protocal + '//mapi.domain.com';
 
 module.exports = {
   api: apiHost,