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

java/pipes.properties

@@ -23,7 +23,7 @@ plugin.jenkins.username=wentao.suo
 plugin.jenkins.password=
 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.password=
 plugin.sonar.token=2680d494baa566810ca988bf8e3aee36b1e51e52
\ No newline at end of file

java/spider-center.properties

@@ -74,7 +74,7 @@ zmxy.type-id=lianghuapai-test
 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.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.schedule.enable=false
 rabbitmq.connection.host=rabbitmq
@@ -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.feature.host=http://featureapi.quantgroup.cn/feature/credit_authorization?business_type=%s&uuid=%s
 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
 
 #kafka

lua-ui/config/pipeline-ui.js

@@ -4,9 +4,9 @@ import { Injectable } from '@angular/core';
 export class GlobalService {
 
 
-    pipesServer: String = 'http://pipes.domain.com';
-    bpServerHost: String = `http://pipes.domain.com`;
-    uploadServerHost: String = `http://pipes.domain.com`;
+    pipesServer: String = 'http://pipesapi.q-gp.com';
+    bpServerHost: String = `http://pipesapi.q-gp.com`;
+    uploadServerHost: String = `http://pipesapi.q-gp.com`;
 
     extend: Function = (s, t) => {
         let ks = Object.keys(t)

nodejs/app-backend.js

@@ -3,166 +3,172 @@ var redis = 'redis'
 var db = 'db'
 
 module.exports = {
-    ip: process.env.OPENSHIFT_NODEJS_IP || process.env.IP || undefined,
-    port: 80,
-    hostname: 'http://sappbackend.domain.com',
-    secrets: {
-        session: process.env.SECRETS_SESSION || 'xyqb-app-api-prod-0.0.1'
-    },
-    usercenter: {
-        host: db,
-        user: 'qa',
-        password: 'qatest',
-        database: 'xyqb_user'
-    },
-    db: {
+	ip: process.env.OPENSHIFT_NODEJS_IP || process.env.IP || undefined,
+	port: 80,
+	hostname: 'http://sappbackend.domain.com',
+	secrets: {
+		session: process.env.SECRETS_SESSION || 'xyqb-app-api-prod-0.0.1'
+	},
+	usercenter: {
+		host: db,
+		user: 'qa',
+		password: 'qatest',
+		database: 'xyqb_user'
+	},
+	db: {
+		host: db,
+		user: 'qa',
+		password: 'qatest',
+		database: 'xyqb'
+	},
+	coreDb: {
 		host: db,
-        user: 'qa',
-        password: 'qatest',
-		    database: 'xyqb'
-    },
-  	coreDb: {
-  		host: db,
-  		user: 'qa',
-  		password: 'qatest',
-  		database: 'xyqb_app'
-  	},
-  	mallDb: {
-  		host: db,
-  		user: 'qa',
-  		password: 'qatest',
-  		database: 'mall'
-  	},
-    msgDb: {
-        host: "192.168.4.3",
-        user: 'qa',
-        password: 'qatest',
-        database: 'msg'
-    },
-  	redis: {
-  		host: redis,
-  		port: '6379'
-  	},
-    jd: {
-        root: 'https://router.jd.com'
-    },
-    xyqbQuery: {
-        root: 'http://query.domain.com'
-    },
-    userServer: {
-        //host: 'http://auth.domain.com' // 密码登录
-        host: 'http://passportapi.domain.com' //函谷关迁移至用户中心
-    },
-    xyqbapiServer: {
-        root: 'http://api.domain.com'
-    },
-    xyqbOfflineApiServer: {
-        root: 'http://offapi.domain.com'
-    },
-    userCenterApiServer: {
-        root: 'http://passportapi.domain.com',
-				host: 'http://passportapi.domain.com'
-    },
-    spiderCenter:{
-        root: 'http://scapi.domain.com',
-        host: 'http://operator.q-gp.com', //this is v2
-    },
-    loanAPIServer: {
-        root: 'http://api.domain.com',
-        loginUrl: 'http://passportapi.domain.com/app/login2' // 免密登录，函谷关迁移至用户中心
-    },
-    blankNote: {
-        root: 'http://btapi.domain.com'
-    },
-    opBackend: {
-        root: 'http://displayapi.domain.com'
-    },
-    mall: {
-        root: 'http://mallapi.domain.com',
-        authRoot: 'http://mallapi.domain.com',
-        clientIp: '61.50.125.14', // 公司的外网IP
-        jd: {
-            app_key: '319e864090664a499ee6417b9e243f62'
-        },
-        host:'http://mallapi.domain.com'
-    },
-    op: {
-        root: 'http://mallapi.domain.com',
-    },
-    score: { //积分系统
-        root: 'http://scoreapi.domain.com',
-    },
-    redPacket: { // 红包系统
-        root: 'http://redpacket.domain.com',
-    },
-    authorization: {
-        root: 'http://mock.q-gp.com/SpiderServer/api',
-        haoxindu: {
-            root: 'http://openapi.quantgroup.cn/qauth'
-        },
-        zhima: {
-            root: 'http://api.domain.com',
-            rootscore:'http://rapi.domain.com'
-        }
-    },
-    activities: {
-        repaymentLottery: {
-            url: 'http://wechat.domain.com/turntable.html'
-        },
-        redEnvelop: {
-            startAt: '2016-03-15',
-            finishAt: '2016-04-01'
-        },
-        invitation: {
-            startAt: '2016-03-15',
-            finishAt: '2016-04-01'
-        },
-        pickCoin: {
-            startAt: '2016-02-29',
-            finishAt: '2016-03-21'
-        },
-        blankNoteRedEnvelop: {
-            startAt: '2016-04-01',
-            finishAt: '2016-05-01'
-        }
-    },
-    loanProcess: {
-        h5Host: 'https://m.domain.com'
-    },
-    blanknote: {
-        h5Host: 'http://bt.domain.com'
-    },
-    mallH5Host: 'http://new-mall.domain.com',
+		user: 'qa',
+		password: 'qatest',
+		database: 'xyqb_app'
+	},
+	mallDb: {
+		host: db,
+		user: 'qa',
+		password: 'qatest',
+		database: 'mall'
+	},
+	msgDb: {
+		host: "192.168.4.3",
+		user: 'qa',
+		password: 'qatest',
+		database: 'msg'
+	},
+	redis: {
+		host: redis,
+		port: '6379'
+	},
+	jd: {
+		root: 'https://router.jd.com'
+	},
+	xyqbQuery: {
+		root: 'http://query.domain.com'
+	},
+	userServer: {
+		//host: 'http://auth.domain.com' // 密码登录
+		host: 'http://passportapi.domain.com' //函谷关迁移至用户中心
+	},
+	xyqbapiServer: {
+		root: 'http://api.domain.com'
+	},
+	xyqbOfflineApiServer: {
+		root: 'http://offapi.domain.com'
+	},
+	userCenterApiServer: {
+		root: 'http://passportapi.domain.com',
+		host: 'http://passportapi.domain.com'
+	},
+	spiderCenter: {
+		root: 'http://scapi.domain.com',
+		host: 'http://operator.q-gp.com',
+		//this is v2
+	},
+	loanAPIServer: {
+		root: 'http://api.domain.com',
+		loginUrl: 'http://passportapi.domain.com/app/login2' // 免密登录，函谷关迁移至用户中心
+	},
+	blankNote: {
+		root: 'http://btapi.domain.com'
+	},
+	opBackend: {
+		root: 'http://displayapi.domain.com'
+	},
+	mall: {
+		root: 'http://mallapi.domain.com',
+		authRoot: 'http://mallapi.domain.com',
+		clientIp: '61.50.125.14',
+		// 公司的外网IP
+		jd: {
+			app_key: '319e864090664a499ee6417b9e243f62'
+		},
+		host: 'http://mallapi.domain.com'
+	},
+	op: {
+		root: 'http://mallapi.domain.com',
+	},
+	score: { //积分系统
+		root: 'http://scoreapi.domain.com',
+	},
+	redPacket: { // 红包系统
+		root: 'http://redpacket.domain.com',
+	},
+	authorization: {
+		root: 'http://mock.q-gp.com/SpiderServer/api',
+		haoxindu: {
+			root: 'http://openapi.quantgroup.cn/qauth'
+		},
+		zhima: {
+			root: 'http://api.domain.com',
+			rootscore: 'http://rapi.domain.com'
+		}
+	},
+	activities: {
+		repaymentLottery: {
+			url: 'http://wechat.domain.com/turntable.html'
+		},
+		redEnvelop: {
+			startAt: '2016-03-15',
+			finishAt: '2016-04-01'
+		},
+		invitation: {
+			startAt: '2016-03-15',
+			finishAt: '2016-04-01'
+		},
+		pickCoin: {
+			startAt: '2016-02-29',
+			finishAt: '2016-03-21'
+		},
+		blankNoteRedEnvelop: {
+			startAt: '2016-04-01',
+			finishAt: '2016-05-01'
+		}
+	},
+	loanProcess: {
+		h5Host: 'https://m.domain.com'
+	},
+	blanknote: {
+		h5Host: 'http://bt.domain.com'
+	},
+	mallH5Host: 'http://new-mall.domain.com',
 
-    activity: {
-        h5Host: 'http://activity.domain.com'
-    },
-    baseUI: {
-        host: 'http://h5.domain.com'
-    },
-    rabbitMQ: {
-        host: redis,
-        user: 'qa',
-        password: 'qatest'
-    },
-    userCreditApiServer: {
-        root: 'http://member.domain.com'
-    },
+	activity: {
+		h5Host: 'http://activity.domain.com'
+	},
+	baseUI: {
+		host: 'http://h5.domain.com'
+	},
+	rabbitMQ: {
+		host: redis,
+		user: 'qa',
+		password: 'qatest'
+	},
+	userCreditApiServer: {
+		root: 'http://member.domain.com'
+	},
 	scoreV2: {
-        host: 'http://scoreapi.domain.com'
+		host: 'http://scoreapi.domain.com'
 	},
 	liangka: {
 		host: 'http://card.domain.com'
 	},
-	payCenter:{
+	payCenter: {
 		host: 'http://payapi.domain.com'
 	},
 	passport: {
 		host: 'http://passportapi.domain.com'
 	},
-    agreement: {
-        host: 'http://api.domain.com'
-    },xyqbLoan: {
-        host: 'http://api.domain.com' //host 是现金贷的地址
-    }
-};
+	agreement: {
+		host: 'http://api.domain.com'
+	},
+	xyqbloan: {
+		host: 'http://api.domain.com' //host 是现金贷的地址
+	},
+	xyqbLoan: {
+		host: 'http://api.domain.com' //host 是现金贷的地址
+	}
+};
\ No newline at end of file

nodejs/op-api.js

 // 和环境有关的配置
+var path = require("path");
 module.exports = {
   // controller中请求各类数据前缀和域名的键值对
   api: {
@@ -67,9 +68,9 @@ module.exports = {
     BUCKET: 'app-sync',
   },
 
-  upload: {
-    path: '/vpants/quant_group/op-api-data'
-  },
+	upload: {
+	    path: path.resolve(__dirname, '../upload')
+	  },
 	
   log4js: {
     "appenders": [
@@ -89,8 +90,5 @@ module.exports = {
         }
       }
     ]
-  },
-  upload: {
-    path:  '/home/quant_group/op-api/upload'
   }
 }