Commit 72cc7499 authored by mengluoyong's avatar mengluoyong

Merge remote-tracking branch 'origin/master'

parents 3db0c679 a8ffd6b1
.idea
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
<component name="CopyrightManager">
<settings default="" />
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/config_repository.iml" filepath="$PROJECT_DIR$/.idea/config_repository.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
This diff is collapsed.
...@@ -9,7 +9,7 @@ pipes.rabbitmq.username=qa ...@@ -9,7 +9,7 @@ pipes.rabbitmq.username=qa
pipes.rabbitmq.password=qatest pipes.rabbitmq.password=qatest
pipes.rabbitmq.vhost=/ pipes.rabbitmq.vhost=/
pipes.role.admin = wentao.suo@quantgroup.cn,dekun.dai@quantgroup.cn,yawei.tian@quantgroup.cn,yong.zhi@quantgroup.cn pipes.role.admin = wentao.suo@quantgroup.cn,enhua.tan@quantgroup.cn,yong.zhi@quantgroup.cn
spring.redis.host=redis spring.redis.host=redis
spring.redis.port=6379 spring.redis.port=6379
...@@ -19,11 +19,11 @@ logging.file=/home/quant_group/logs/pipes.log ...@@ -19,11 +19,11 @@ logging.file=/home/quant_group/logs/pipes.log
#======= #=======
plugin.jenkins.host=http://192.168.4.96:8080 plugin.jenkins.host=http://192.168.4.96:8080
plugin.jenkins.username=wentao.suo plugin.jenkins.username=enhua.tan
plugin.jenkins.password= plugin.jenkins.password=
plugin.jenkins.token=6ac1030b23f49c5fb007a1e9870952ce plugin.jenkins.token=ddda66d011a2eaa883348463b4f9dd1b
plugin.sonar.host=http://sonar.quantgroups.com plugin.sonar.host=http://sonar.quantgroups.com
plugin.sonar.username=admin plugin.sonar.username=admin
plugin.sonar.password= plugin.sonar.password=
plugin.sonar.token=f720d1bfd74d1d269b5d8f482664c7c87fa91a17 plugin.sonar.token=f720d1bfd74d1d269b5d8f482664c7c87fa91a17
\ No newline at end of file
...@@ -37,7 +37,7 @@ filter.allowedOrigin=* ...@@ -37,7 +37,7 @@ filter.allowedOrigin=*
filter.allowedHeaders=Origin, No-Cache, x-auth-token, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type,Authorization,login_token filter.allowedHeaders=Origin, No-Cache, x-auth-token, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type,Authorization,login_token
# 测试环境 urge_dispatcher 库 # 测试环境 urge_dispatcher 库
data.source.dispatcher.jdbcUrl=jdbc:mysql://172.20.7.18:3311/urge_dispatcher?useUnicode=true&characterEncoding=UTF8&useSSL=false data.source.dispatcher.jdbcUrl=jdbc:mysql://172.20.7.18:3313/urge_dispatcher?useUnicode=true&characterEncoding=UTF8&useSSL=false
data.source.dispatcher.username=max_user data.source.dispatcher.username=max_user
data.source.dispatcher.password=2pVoIvexk3ZLvvyv data.source.dispatcher.password=2pVoIvexk3ZLvvyv
data.source.dispatcher.maxPoolSize=20 data.source.dispatcher.maxPoolSize=20
...@@ -68,8 +68,8 @@ data.source.collection.maxPoolSize=10 ...@@ -68,8 +68,8 @@ data.source.collection.maxPoolSize=10
#测试环境redis host #测试环境redis host
dispatcher.data.redis.defaultExpiration=3600 dispatcher.data.redis.defaultExpiration=3600
dispatcher.redis.master.host=redis dispatcher.redis.master.host=192.168.6.16
dispatcher.redis.master.port=6379 dispatcher.redis.master.port=20471
dispatcher.redis.master.name= dispatcher.redis.master.name=
dispatcher.redis.sentinel1.host= dispatcher.redis.sentinel1.host=
dispatcher.redis.sentinel1.port=1 dispatcher.redis.sentinel1.port=1
...@@ -81,9 +81,9 @@ dispatcher.redis.sentinel3.port=1 ...@@ -81,9 +81,9 @@ dispatcher.redis.sentinel3.port=1
# 全部换成测试环境的配置api host config 都要换成测试环境 # 全部换成测试环境的配置api host config 都要换成测试环境
model.api.host=http://model.quantgroup.cn model.api.host=http://model.quantgroup.cn
passport.api.host=http://192.168.4.26:7042 passport.api.host=http://passportapi.domain.com
paycenter.api.host=http://192.168.4.26:7006 paycenter.api.host=http://payapi.domain.com
cashLoan.api.host=http://192.168.4.26:7003 cashLoan.api.host=http://api.domain.com
cashLoan.api.host.v2=http://172.16.4.69:9004 cashLoan.api.host.v2=http://172.16.4.69:9004
...@@ -113,7 +113,7 @@ dachui.api.loginId=yunche ...@@ -113,7 +113,7 @@ dachui.api.loginId=yunche
urge.third.hejun.host=https://lianghuapai.hjzddata.com/ urge.third.hejun.host=https://lianghuapai.hjzddata.com/
#企美地址 #企美地址
urge.third.qimei.host=http://172.30.220.20:9015/ urge.third.qimei.host=http://cuishou-chenxingchun.liangkebang.com/
#xyqb 查询接口 可以批量查询 #xyqb 查询接口 可以批量查询
xyqb.url.batch.repaymentQuery=http://172.30.5.51:9004/ex/repayment/view xyqb.url.batch.repaymentQuery=http://172.30.5.51:9004/ex/repayment/view
...@@ -129,4 +129,10 @@ ud.zk.job.connectionTimeoutMilliseconds=1000 ...@@ -129,4 +129,10 @@ ud.zk.job.connectionTimeoutMilliseconds=1000
# 新审核系统 URL # 新审核系统 URL
feature.url = http://172.20.1.131:901 feature.url = http://172.20.1.131:9013
#自动分案任务队列
rabbitmq.urge.dispatcher.vhost=/urge_dispatcher
rabbitmq.queue.auto.packing.queue=auto_packing_queue
urge.node.hosts=127.0.0.1:9019
\ No newline at end of file
const apiHost = '${protocol}//cuishou.domain.com' const protocol = window.location.protocol
const apiHost = `${protocol}//cuishou.domain.com`
const serviceHost = apiHost + '/service' const serviceHost = apiHost + '/service'
const urgeApiHost = '${protocol}//urge.domain.com' const urgeApiHost = `${protocol}//urge.domain.com`
export default { export default {
serviceHost, serviceHost,
urgeApiHost urgeApiHost
} }
/**
* Created by mengluoyong on 2018/8/22.
*/
const protocol = window.location.protocol
const apiHost = `${protocol}//urge.domain.com`
const serviceHost = apiHost + ''
const urgeApiHost = `${protocol}//urge.domain.com`
export default {
serviceHost,
urgeApiHost
}
\ No newline at end of file
var protocal = window.location.protocol var protocal = window.location.protocol
var apiHost = protocal + '//operator.liangkebang.com' var apiHost = protocal + '//operator.liangkebang.com'
var xyqbApiHost = protocal + '//api.domain.com'; var xyqbApiHost = protocal + '//mapi.domain.com';
module.exports = { module.exports = {
api: apiHost, api: apiHost,
......
...@@ -7,7 +7,7 @@ module.exports = { ...@@ -7,7 +7,7 @@ module.exports = {
XyqbUserUrl: protocal + '//passport.domain.com', XyqbUserUrl: protocal + '//passport.domain.com',
px2rem: 100, px2rem: 100,
domain: domain, domain: domain,
weixinAppid:'wx0a7c0bce0c3ac523', weixinAppid:'wx7188560d6923088d',
weixinUri:encodeURIComponent('https://passportapi.domain.com/wechat/active_redirect'), weixinUri:encodeURIComponent('https://passportapi.domain.com/wechat/active_redirect'),
rentingApi:protocal + "//api.domain.com", rentingApi:protocal + "//api.domain.com",
rentingUrl:protocal + "//activity.domain.com", rentingUrl:protocal + "//activity.domain.com",
......
let protocol = window.location.protocol let protocol = window.location.protocol
module.exports = { module.exports = {
api: protocol + "//passportapi2.domain.com", api: protocol + "//passportapi2.domain.com",
weixinAppid: 'wx7188560d6923088d', //'wx89894cd83d117b26' weixinAppid: 'wx7188560d6923088d', //'wx7188560d6923088d'
weixinUri: protocol + '//passportapi.domain.com/wechat/receiveCode/extdata/', weixinUri: protocol + '//passportapi.domain.com/wechat/receiveCode/extdata/',
test: true, test: true,
domain: "passport.domain.com" domain: "passport.domain.com"
......
const protocol = window.location.protocol
const opapiHost = `${protocol}//opapi.domain.com`
const lzsApiHost = `${opapiHost}/lzs`
export default {
opapiHost,
lzsApiHost
}
...@@ -7,24 +7,25 @@ module.exports = { ...@@ -7,24 +7,25 @@ module.exports = {
redpacket_api: 'http://redpacket.domain.com', redpacket_api: 'http://redpacket.domain.com',
app_api: 'http://sappbackend.domain.com', app_api: 'http://sappbackend.domain.com',
btCapital_api: 'http://fundmanage.domain.com', btCapital_api: 'http://fundmanage.domain.com',
btDirect_api: 'http://internal.btzt.domain.com', btDirect_api: 'http://internal.btzt.domain.com',
boHai_api: 'http://fundmanage.domain.com', boHai_api: 'http://fundmanage.domain.com',
es_api:'http://172.20.2.130:9200', es_api: 'http://172.20.2.130:9200',
sms_api: 'http://backend.domain.com', sms_api: 'http://backend.domain.com',
userCenter_api: 'http://passportapi2.domain.com', userCenter_api: 'http://passportapi2.domain.com',
zbj_api: 'http://taurus.quantgroup.cn/', zbj_api: 'http://taurus.quantgroup.cn/',
//ynTrust_api: 'http://target_host_name:7034', //ynTrust_api: 'http://target_host_name:7034',
gdxd_api: 'http://gyxd.domain.com', gdxd_api: 'http://gyxd.domain.com',
msgTmp_api: 'http://192.168.4.3:8051', msgTmp_api: 'http://192.168.4.3:8051',
msgPush_api: 'http://message-center-op', msgPush_api: 'http://message-center-op',
statistics_api: 'http://statisticsapi.domain.com', statistics_api: 'http://statisticsapi.domain.com',
clotho_api:'http://clotho.domain.com', clotho_api: 'http://clotho.domain.com',
fe_es_api:'http://192.168.4.51:9200', fe_es_api: 'http://192.168.4.51:9200',
merchant_api: 'http://merchantapi.domain.com', merchant_api: 'http://merchantapi.domain.com',
settlement_api: 'http://settlementapi.domain.com', settlement_api: 'http://settlementapi.domain.com',
score_api: 'http://scoreapi.domain.com', score_api: 'http://scoreapi.domain.com',
quantcube_api: 'http://quantcube-api.domain.com', quantcube_api: 'http://quantcube-api.domain.com',
ruleEngine_api: 'http://rule-engine.domain.com' ruleEngine_api: 'http://rule-engine.domain.com',
lzs_api: 'http://qg-ai-calc.domain.com'
}, },
// 站点相关的配置 // 站点相关的配置
...@@ -34,27 +35,28 @@ module.exports = { ...@@ -34,27 +35,28 @@ module.exports = {
}, },
userCenter: 'http://op.domain.com', userCenter: 'http://op.domain.com',
newUserCenter: 'http://op.domain.com',
// mongo配置 // mongo配置
mongo: { mongo: {
options: { options: {
options: { options: {
auto_reconnect: true, auto_reconnect: true,
poolSize: 3, poolSize: 3,
socketOptions: { socketOptions: {
keepAlive: 300000, keepAlive: 300000,
connectTimeoutMS: 30000 connectTimeoutMS: 30000
} }
}, },
}, },
api: { api: {
'implied': 'mongodb://192.168.4.50:27017/op', 'implied': 'mongodb://192.168.4.50:27017/op',
'xyqb': 'mongodb://192.168.4.50:27017/h5_xyqb', 'xyqb': 'mongodb://192.168.4.50:27017/h5_xyqb',
'loan': 'mongodb://192.168.4.50:27017/loan', 'loan': 'mongodb://192.168.4.50:27017/loan',
'ka_factory': 'mongodb://192.168.4.50:27017/ka_factory' 'ka_factory': 'mongodb://192.168.4.50:27017/ka_factory'
} }
}, },
// redis配置 // redis配置
redis: { redis: {
api: 'redis://redis:6379/1' api: 'redis://redis:6379/1'
...@@ -63,15 +65,17 @@ module.exports = { ...@@ -63,15 +65,17 @@ module.exports = {
// 七牛配置 // 七牛配置
qiniu: { qiniu: {
domain: 'http://opapi.domain.com', domain: 'http://opapi.domain.com',
cdn_domain: 'https://oic74zs8j.qnssl.com',
refresh_api: 'http://fusion.qiniuapi.com/refresh',
ACCESS_KEY: 'QyjX3i2tEMvrv50j6M_wpb9YoFJbxSm3jEkOj9lY', ACCESS_KEY: 'QyjX3i2tEMvrv50j6M_wpb9YoFJbxSm3jEkOj9lY',
SECRET_KEY: 'uoMTzRLoElTAKXVzelGgTvI652zJ8bCz_qqTtoGl', SECRET_KEY: 'uoMTzRLoElTAKXVzelGgTvI652zJ8bCz_qqTtoGl',
BUCKET: 'app-sync', BUCKET: 'app-sync',
}, },
upload: { upload: {
path: path.resolve(__dirname, '../upload') path: path.resolve(__dirname, '../upload')
}, },
log4js: { log4js: {
"appenders": [ "appenders": [
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment