Commit 0f77dd42 authored by kalvin's avatar kalvin

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

parents efdf0e6e bad22985
...@@ -23,7 +23,7 @@ plugin.jenkins.username=wentao.suo ...@@ -23,7 +23,7 @@ plugin.jenkins.username=wentao.suo
plugin.jenkins.password= plugin.jenkins.password=
plugin.jenkins.token=6ac1030b23f49c5fb007a1e9870952ce plugin.jenkins.token=6ac1030b23f49c5fb007a1e9870952ce
plugin.sonar.host=http://172.30.3.42:9000 plugin.sonar.host=http://sonar.q-gp.com
plugin.sonar.username=wentao.suo plugin.sonar.username=wentao.suo
plugin.sonar.password= plugin.sonar.password=
plugin.sonar.token=2680d494baa566810ca988bf8e3aee36b1e51e52 plugin.sonar.token=2680d494baa566810ca988bf8e3aee36b1e51e52
\ No newline at end of file
...@@ -74,7 +74,7 @@ zmxy.type-id=lianghuapai-test ...@@ -74,7 +74,7 @@ zmxy.type-id=lianghuapai-test
zmxy.merchant-id=268820000055252338441 zmxy.merchant-id=268820000055252338441
zmxy.private-key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOWN5NtRPXVD1z+4mL7R9uXjWbKxful1ur5BluiB7vKuMRkYRa4AYUnMSJ1ckBTudj74vLawQL3n+GaWw6kR3Ql/sKObEXlFuTdyVkdA+8HdaNkNTblug4wAvqeBZgvDRM4NWjQBADeH1LjRW0ZFLexB+YEoWt4JjSdrODrVIqmXAgMBAAECgYAZZPMWWAxmdpTPVcqAAZZApD/+Bqi1hvKbrYHWQtl+O0rvLcI3l48rrM+zqNO/nQmzuayWwTTITWsrXi5S+8jp2GrNJam8uRr6KXJ/ZTlBjsS1xl9WD93fy4tr27UbgoARAJhBtqsNuQk4aDYEYujAva+mp5hn/RYMc5xq0gLCUQJBAPxJfG6mVnXQAkkc4yYlf0iENAydh+fvB+cW2Ew+5THzoZUj9RXgFGgIUGz+pH7kcSMFqwliWzCvKYtWKknajEsCQQDo7sKX3zkHJZ09rk8j7IxzMpcxhL8T5PcFRhdpqR7QLzkER2VNr1eXm8URA7MLPkO9IQWIuRvCRGh0A7xHSfBlAkEAujerxyi0LOXKqhjOeXu4Bdi/aohkpofC94nfQfgyyLoiDKmr3+e0aE2qv6j91kPcVpN6ecTFtpu0OIrzT+wnHQJAUYpzeHLeJdBXESaZ8bt3F0SYhO8xbKd0idYVkBlx/fLqBMNxhRZilWIkRGaFIOR1FhofM9OJEiKcZjCAknwhuQJAHNfXALgO3c7KnOioHEVT0LxmdvsPgb430wGNXWoWCMnN6PJMo/tsWsxnaKURdG8I93MQe/0E7Lna1gQ0amBhmg== zmxy.private-key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOWN5NtRPXVD1z+4mL7R9uXjWbKxful1ur5BluiB7vKuMRkYRa4AYUnMSJ1ckBTudj74vLawQL3n+GaWw6kR3Ql/sKObEXlFuTdyVkdA+8HdaNkNTblug4wAvqeBZgvDRM4NWjQBADeH1LjRW0ZFLexB+YEoWt4JjSdrODrVIqmXAgMBAAECgYAZZPMWWAxmdpTPVcqAAZZApD/+Bqi1hvKbrYHWQtl+O0rvLcI3l48rrM+zqNO/nQmzuayWwTTITWsrXi5S+8jp2GrNJam8uRr6KXJ/ZTlBjsS1xl9WD93fy4tr27UbgoARAJhBtqsNuQk4aDYEYujAva+mp5hn/RYMc5xq0gLCUQJBAPxJfG6mVnXQAkkc4yYlf0iENAydh+fvB+cW2Ew+5THzoZUj9RXgFGgIUGz+pH7kcSMFqwliWzCvKYtWKknajEsCQQDo7sKX3zkHJZ09rk8j7IxzMpcxhL8T5PcFRhdpqR7QLzkER2VNr1eXm8URA7MLPkO9IQWIuRvCRGh0A7xHSfBlAkEAujerxyi0LOXKqhjOeXu4Bdi/aohkpofC94nfQfgyyLoiDKmr3+e0aE2qv6j91kPcVpN6ecTFtpu0OIrzT+wnHQJAUYpzeHLeJdBXESaZ8bt3F0SYhO8xbKd0idYVkBlx/fLqBMNxhRZilWIkRGaFIOR1FhofM9OJEiKcZjCAknwhuQJAHNfXALgO3c7KnOioHEVT0LxmdvsPgb430wGNXWoWCMnN6PJMo/tsWsxnaKURdG8I93MQe/0E7Lna1gQ0amBhmg==
zmxy.public-key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZs7ulCmvUzkhu3RKBsjBng8ScaxpPXUvGOjCzNO9zaD2JOruRn07toEui7Y1mIeMbjT/tFv1VqmsfGKyDhf+G9tyYwStg1edeYnLnisRnaZkE8YG7913SnaYqxtC4pZINmktLcgXfZ1m4BJAXD7OViDgMxc4FqoE1VbG7vixgjQIDAQAB zmxy.public-key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZs7ulCmvUzkhu3RKBsjBng8ScaxpPXUvGOjCzNO9zaD2JOruRn07toEui7Y1mIeMbjT/tFv1VqmsfGKyDhf+G9tyYwStg1edeYnLnisRnaZkE8YG7913SnaYqxtC4pZINmktLcgXfZ1m4BJAXD7OViDgMxc4FqoE1VbG7vixgjQIDAQAB
spider.check.state.url=http://192.168.4.193:8080/SpiderServer/api/parse/checkStatus.json spider.check.state.url=http://172.30.220.7:8080/SpiderServer/api/parse/checkStatus.json
spider.report.make.url=http://192.168.4.201 spider.report.make.url=http://192.168.4.201
spider.schedule.enable=false spider.schedule.enable=false
rabbitmq.connection.host=rabbitmq rabbitmq.connection.host=rabbitmq
...@@ -153,7 +153,7 @@ yunying.activity.url=http://redpacket-${NAMESPACE}.q-gp.com/api/activity/59/reco ...@@ -153,7 +153,7 @@ yunying.activity.url=http://redpacket-${NAMESPACE}.q-gp.com/api/activity/59/reco
user.sdk.url=http://passportapi-${NAMESPACE}.q-gp.com user.sdk.url=http://passportapi-${NAMESPACE}.q-gp.com
user.feature.host=http://featureapi.quantgroup.cn/feature/credit_authorization?business_type=%s&uuid=%s user.feature.host=http://featureapi.quantgroup.cn/feature/credit_authorization?business_type=%s&uuid=%s
spider.center.on.off=0 spider.center.on.off=0
alarm.http.url=http://172.20.1.93:9090/common/alert/authcenter alarm.http.url=http://172.30.220.7:9090/common/alert/authcenter
spider.finish.new.url=http://api-${NAMESPACE}.q-gp.com/ex/spider_center/newSpider_finish spider.finish.new.url=http://api-${NAMESPACE}.q-gp.com/ex/spider_center/newSpider_finish
#kafka #kafka
......
...@@ -4,9 +4,9 @@ import { Injectable } from '@angular/core'; ...@@ -4,9 +4,9 @@ import { Injectable } from '@angular/core';
export class GlobalService { export class GlobalService {
pipesServer: String = 'http://pipes.domain.com'; pipesServer: String = 'http://pipesapi.q-gp.com';
bpServerHost: String = `http://pipes.domain.com`; bpServerHost: String = `http://pipesapi.q-gp.com`;
uploadServerHost: String = `http://pipes.domain.com`; uploadServerHost: String = `http://pipesapi.q-gp.com`;
extend: Function = (s, t) => { extend: Function = (s, t) => {
let ks = Object.keys(t) let ks = Object.keys(t)
......
...@@ -3,166 +3,172 @@ var redis = 'redis' ...@@ -3,166 +3,172 @@ var redis = 'redis'
var db = 'db' var db = 'db'
module.exports = { module.exports = {
ip: process.env.OPENSHIFT_NODEJS_IP || process.env.IP || undefined, ip: process.env.OPENSHIFT_NODEJS_IP || process.env.IP || undefined,
port: 80, port: 80,
hostname: 'http://sappbackend.domain.com', hostname: 'http://sappbackend.domain.com',
secrets: { secrets: {
session: process.env.SECRETS_SESSION || 'xyqb-app-api-prod-0.0.1' session: process.env.SECRETS_SESSION || 'xyqb-app-api-prod-0.0.1'
}, },
usercenter: { usercenter: {
host: db, host: db,
user: 'qa', user: 'qa',
password: 'qatest', password: 'qatest',
database: 'xyqb_user' database: 'xyqb_user'
}, },
db: { db: {
host: db,
user: 'qa',
password: 'qatest',
database: 'xyqb'
},
coreDb: {
host: db, host: db,
user: 'qa', user: 'qa',
password: 'qatest', password: 'qatest',
database: 'xyqb' database: 'xyqb_app'
}, },
coreDb: { mallDb: {
host: db, host: db,
user: 'qa', user: 'qa',
password: 'qatest', password: 'qatest',
database: 'xyqb_app' database: 'mall'
}, },
mallDb: { msgDb: {
host: db, host: "192.168.4.3",
user: 'qa', user: 'qa',
password: 'qatest', password: 'qatest',
database: 'mall' database: 'msg'
}, },
msgDb: { redis: {
host: "192.168.4.3", host: redis,
user: 'qa', port: '6379'
password: 'qatest', },
database: 'msg' jd: {
}, root: 'https://router.jd.com'
redis: { },
host: redis, xyqbQuery: {
port: '6379' root: 'http://query.domain.com'
}, },
jd: { userServer: {
root: 'https://router.jd.com' //host: 'http://auth.domain.com' // 密码登录
}, host: 'http://passportapi.domain.com' //函谷关迁移至用户中心
xyqbQuery: { },
root: 'http://query.domain.com' xyqbapiServer: {
}, root: 'http://api.domain.com'
userServer: { },
//host: 'http://auth.domain.com' // 密码登录 xyqbOfflineApiServer: {
host: 'http://passportapi.domain.com' //函谷关迁移至用户中心 root: 'http://offapi.domain.com'
}, },
xyqbapiServer: { userCenterApiServer: {
root: 'http://api.domain.com' root: 'http://passportapi.domain.com',
}, host: 'http://passportapi.domain.com'
xyqbOfflineApiServer: { },
root: 'http://offapi.domain.com' spiderCenter: {
}, root: 'http://scapi.domain.com',
userCenterApiServer: { host: 'http://operator.q-gp.com',
root: 'http://passportapi.domain.com', //this is v2
host: 'http://passportapi.domain.com' },
}, loanAPIServer: {
spiderCenter:{ root: 'http://api.domain.com',
root: 'http://scapi.domain.com', loginUrl: 'http://passportapi.domain.com/app/login2' // 免密登录,函谷关迁移至用户中心
host: 'http://operator.q-gp.com', //this is v2 },
}, blankNote: {
loanAPIServer: { root: 'http://btapi.domain.com'
root: 'http://api.domain.com', },
loginUrl: 'http://passportapi.domain.com/app/login2' // 免密登录,函谷关迁移至用户中心 opBackend: {
}, root: 'http://displayapi.domain.com'
blankNote: { },
root: 'http://btapi.domain.com' mall: {
}, root: 'http://mallapi.domain.com',
opBackend: { authRoot: 'http://mallapi.domain.com',
root: 'http://displayapi.domain.com' clientIp: '61.50.125.14',
}, // 公司的外网IP
mall: { jd: {
root: 'http://mallapi.domain.com', app_key: '319e864090664a499ee6417b9e243f62'
authRoot: 'http://mallapi.domain.com', },
clientIp: '61.50.125.14', // 公司的外网IP host: 'http://mallapi.domain.com'
jd: { },
app_key: '319e864090664a499ee6417b9e243f62' op: {
}, root: 'http://mallapi.domain.com',
host:'http://mallapi.domain.com' },
}, score: { //积分系统
op: { root: 'http://scoreapi.domain.com',
root: 'http://mallapi.domain.com', },
}, redPacket: { // 红包系统
score: { //积分系统 root: 'http://redpacket.domain.com',
root: 'http://scoreapi.domain.com', },
}, authorization: {
redPacket: { // 红包系统 root: 'http://mock.q-gp.com/SpiderServer/api',
root: 'http://redpacket.domain.com', haoxindu: {
}, root: 'http://openapi.quantgroup.cn/qauth'
authorization: { },
root: 'http://mock.q-gp.com/SpiderServer/api', zhima: {
haoxindu: { root: 'http://api.domain.com',
root: 'http://openapi.quantgroup.cn/qauth' rootscore: 'http://rapi.domain.com'
}, }
zhima: { },
root: 'http://api.domain.com', activities: {
rootscore:'http://rapi.domain.com' repaymentLottery: {
} url: 'http://wechat.domain.com/turntable.html'
}, },
activities: { redEnvelop: {
repaymentLottery: { startAt: '2016-03-15',
url: 'http://wechat.domain.com/turntable.html' finishAt: '2016-04-01'
}, },
redEnvelop: { invitation: {
startAt: '2016-03-15', startAt: '2016-03-15',
finishAt: '2016-04-01' finishAt: '2016-04-01'
}, },
invitation: { pickCoin: {
startAt: '2016-03-15', startAt: '2016-02-29',
finishAt: '2016-04-01' finishAt: '2016-03-21'
}, },
pickCoin: { blankNoteRedEnvelop: {
startAt: '2016-02-29', startAt: '2016-04-01',
finishAt: '2016-03-21' finishAt: '2016-05-01'
}, }
blankNoteRedEnvelop: { },
startAt: '2016-04-01', loanProcess: {
finishAt: '2016-05-01' h5Host: 'https://m.domain.com'
} },
}, blanknote: {
loanProcess: { h5Host: 'http://bt.domain.com'
h5Host: 'https://m.domain.com' },
}, mallH5Host: 'http://new-mall.domain.com',
blanknote: {
h5Host: 'http://bt.domain.com'
},
mallH5Host: 'http://new-mall.domain.com',
activity: { activity: {
h5Host: 'http://activity.domain.com' h5Host: 'http://activity.domain.com'
}, },
baseUI: { baseUI: {
host: 'http://h5.domain.com' host: 'http://h5.domain.com'
}, },
rabbitMQ: { rabbitMQ: {
host: redis, host: redis,
user: 'qa', user: 'qa',
password: 'qatest' password: 'qatest'
}, },
userCreditApiServer: { userCreditApiServer: {
root: 'http://member.domain.com' root: 'http://member.domain.com'
}, },
scoreV2: { scoreV2: {
host: 'http://scoreapi.domain.com' host: 'http://scoreapi.domain.com'
}, },
liangka: { liangka: {
host: 'http://card.domain.com' host: 'http://card.domain.com'
}, },
payCenter:{ payCenter: {
host: 'http://payapi.domain.com' host: 'http://payapi.domain.com'
}, },
passport: { passport: {
host: 'http://passportapi.domain.com' host: 'http://passportapi.domain.com'
}, },
agreement: { agreement: {
host: 'http://api.domain.com' host: 'http://api.domain.com'
},xyqbLoan: { },
host: 'http://api.domain.com' //host 是现金贷的地址 xyqbloan: {
} host: 'http://api.domain.com' //host 是现金贷的地址
}; },
xyqbLoan: {
host: 'http://api.domain.com' //host 是现金贷的地址
}
};
\ No newline at end of file
// 和环境有关的配置 // 和环境有关的配置
var path = require("path");
module.exports = { module.exports = {
// controller中请求各类数据前缀和域名的键值对 // controller中请求各类数据前缀和域名的键值对
api: { api: {
...@@ -67,9 +68,9 @@ module.exports = { ...@@ -67,9 +68,9 @@ module.exports = {
BUCKET: 'app-sync', BUCKET: 'app-sync',
}, },
upload: { upload: {
path: '/vpants/quant_group/op-api-data' path: path.resolve(__dirname, '../upload')
}, },
log4js: { log4js: {
"appenders": [ "appenders": [
...@@ -89,8 +90,5 @@ module.exports = { ...@@ -89,8 +90,5 @@ module.exports = {
} }
} }
] ]
},
upload: {
path: '/home/quant_group/op-api/upload'
} }
} }
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