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

java/btzt.properties

@@ -105,7 +105,7 @@ lhp.sftp.username=hyrw
 lhp.sftp.password=t7u.Ow!MmJx9dA
 lhp.sftp.port=49528
 # ka地址
-ka.callback.url=http://silkroad.xyqb.com/
+ka.callback.url=http://silkroad.domain.com/
 #合同
 contract.application.uri=http://pdf-${NAMESPACE}.q-gp.com
 # quickpass

java/cash-loan-flow.properties

@@ -184,7 +184,7 @@ standard.crawler.url=http://192.168.4.193:8099/auth-center/ex/data/import.json
 coupon.url=http://redpacket-${NAMESPACE}.q-gp.com
 usersys.motan.registry=zookeeper:2181
 #招联KA
-spider-center.check.url.new=http://scapi.xyqb.com
+spider-center.check.url.new=http://scapi.domain.com
 auth-center.ocr.url=http://operator.q-gp.com
 cash.url=http://qapi-${NAMESPACE}.q-gp.com
 warning.loan.mail.port = 587

java/cuishou.properties

@@ -15,7 +15,7 @@ query.url=http://data-query.quantgroup.cn
 paycenter.url=http://payapi-${NAMESPACE}.q-gp.com
 user.url=http://passportapi-${NAMESPACE}.q-gp.com
 report.url=http://report.quantgroup.cn
-fin.url=http://fsapi.xyqb.com
+fin.url=http://fsapi.domain.com
 query.token=collection
 jobs.schedule=0 15 10 * 1 ?
 #jobs.schedule1=0 1/2 * * * ?

java/du-jiang-yan.properties

@@ -95,7 +95,7 @@ xyqb.url=http://api-${NAMESPACE}.q-gp.com
 # xyqb-ui
 xyqb-ui.url=http://m-${NAMESPACE}.q-gp.com
 # xyqb-query
-xyqb.slave.query.url=http://query.xyqb.com
+xyqb.slave.query.url=http://query.domain.com
 # 爬虫地址
 quantgroup.crawler.url= http://192.168.4.193:8080/SpiderServer/api/dataTransfer/convert.json
 # 绑卡结果反馈job

java/financial-system.properties

@@ -163,7 +163,7 @@ thirdparty.api.hubei=http://116.211.134.215/Gateway/servlet/OutsiteReqServlet
 compensationday.file.path=compensation-days.json
 #存储每次请求响应的日志文件
 hubei.history.filepath=/Users/dufeifei/Downloads
-rapi.xyqb.plans=http://rapi.xyqb.com/external/hubei/plans
+rapi.xyqb.plans=http://rapi.domain.com/external/hubei/plans
 #红包查询 测试环境
 redpacket.url.queryPage=http://redpacket-${NAMESPACE}.q-gp.com/api/coupon/cash_record/search
 #海尔云贷

java/gyxd.properties

@@ -116,7 +116,7 @@ contract.policy.ssqian.account.private-key=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wg
 # ***** 广源债转配置结束******  
 filepath.contract.url=/home/quant_group/file_upload/gyxd_system/contract/
 filepath.ocr.url=/home/quant_group/file_upload/gyxd_system/idcard/
-usersys.url=http://userqry.xyqb.com
+usersys.url=http://userqry.domain.com
 #广源线下债转
 #上传路径 商务上传确认债转文件
 business.upload.file.path=/home/quant_group/file_upload/gyxd_system/offline_trans/

java/pipes.properties

@@ -3,13 +3,11 @@
 mongo.uri = mongodb://qa:qatest@mongodb:27017/pipes
 mongo.database = pipes
 
-spring.rabbitmq.host=rabbitmq
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=qa
-spring.rabbitmq.password=qatest
-spring.rabbitmq.publisher-confirms=true
-spring.rabbitmq.virtual-host=/
-pipes.rabbitmq.gitevent.quene = git_event
+pipes.rabbitmq.host=rabbitmq
+pipes.rabbitmq.port=5672
+pipes.rabbitmq.username=qa
+pipes.rabbitmq.password=qatest
+pipes.rabbitmq.vhost=/
 
 spring.redis.host=redis
 spring.redis.port=6379
@@ -24,6 +22,6 @@ plugin.jenkins.password=
 plugin.jenkins.token=6ac1030b23f49c5fb007a1e9870952ce
 
 plugin.sonar.host=http://sonar.q-gp.com
-plugin.sonar.username=wentao.suo
+plugin.sonar.username=admin
 plugin.sonar.password=
-plugin.sonar.token=2680d494baa566810ca988bf8e3aee36b1e51e52
\ No newline at end of file
+plugin.sonar.token=f720d1bfd74d1d269b5d8f482664c7c87fa91a17
\ No newline at end of file

java/rule-engine.properties

@@ -8,22 +8,25 @@ db.minPoolSize=1
 db.maxPoolSize=5
 db.rule.engine.username=qa
 db.rule.engine.password=qatest
-db.rule.engine.url=jdbc:mysql://db:3306/
-db.rule.engine.database=rule_engine?useUnicode=true&characterEncoding=UTF8
+db.rule.engine.url=jdbc:mysql://db:3306/workflow?useUnicode=true&characterEncoding=UTF8
 
 #db log
-log.db.rule.engine.username=root
-log.db.rule.engine.password=
-log.db.rule.engine.url=jdbc:mysql://db:4000/
-log.db.rule.engine.database=rule_engine?useUnicode=true&characterEncoding=UTF8
+log.db.rule.engine.username=qa
+log.db.rule.engine.password=qatest
+log.db.rule.engine.url=jdbc:mysql://db:3306/workflow?useUnicode=true&characterEncoding=UTF8
 log.db.minPoolSize=1
 log.db.maxPoolSize=10
 
 #kafka producer
-producer.bootstrap.servers=qc2-bigdata-hadoop-qa-1001:9092,qc2-bigdata-hadoop-qa-1002:9092,qc2-bigdata-hadoop-qa-1003:9092,qc2-bigdata-hadoop-qa-1004:9092
+# qc2-bigdata-hadoop-qa-1001 192.168.64.5
+# qc2-bigdata-hadoop-qa-1002 192.168.64.6
+# qc2-bigdata-hadoop-qa-1003 192.168.64.7
+# qc2-bigdata-hadoop-qa-1004 192.168.64.8
+
+producer.bootstrap.servers=192.168.64.5:9092,192.168.64.6:9092,192.168.64.7:9092,192.168.64.8:9092
 
 #kafka consumer
-consumer.bootstrap.servers=qc2-bigdata-hadoop-qa-1001:9092,qc2-bigdata-hadoop-qa-1002:9092,qc2-bigdata-hadoop-qa-1003:9092,qc2-bigdata-hadoop-qa-1004:9092
+consumer.bootstrap.servers=192.168.64.5:9092,192.168.64.6:9092,192.168.64.7:9092,192.168.64.8:9092
 consumer.group.id=rule_engine
 
 ##feature api url
@@ -41,3 +44,14 @@ rule.redis.sentinel2.host=
 rule.redis.sentinel2.port=1
 rule.redis.sentinel3.host=
 rule.redis.sentinel3.port=1
+
+security.sessions=never
+spring.aop.proxy-target-class=true
+spring.velocity.checkTemplateLocation=false
+spring.velocity.properties.input.encoding=utf-8
+spring.velocity.properties.output.encoding=utf-8
+spring.velocity.content-type=text/html;charset=utf-8
+spring.velocity.cache=true
+multipart.max-file-size=30Mb
+multipart.max-request-size=30Mb
+maxPostSize=-1
\ No newline at end of file

java/traffic-webapp.properties

@@ -63,9 +63,9 @@ db.traffic.url=jdbc:mysql://db:3306/
 db.traffic.database=traffic_distribution?useUnicode=true&characterEncoding=UTF8
 
 ## domain
-domains.traffic=http://qg-op-backend
-domains.dispatch=https://dispatch.domain.com
-domains.passportapi2=http://passportapi.domain.com
+domains.traffic=http://flow-${NAMESPACE}.q-gp.com
+domains.dispatch=https://dispatch-${NAMESPACE}.q-gp..com
+domains.passportapi2=http://passportapi-${NAMESPACE}.q-gp.com
 domains.userqry=http://xyqb-user2-query
 
 ##schedule switch
@@ -108,7 +108,7 @@ qiniu.storage.secretKey=uoMTzRLoElTAKXVzelGgTvI652zJ8bCz_qqTtoGl
 qiniu.storage.bucket=contract-test
 qiniu.storage.url=http://o9xncg89j.bkt.clouddn.com/
 
-channel.query.url=http://h5-${NAMESPACE}.domain.com/sms_op_market/show_index
+channel.query.url=http://h5-${NAMESPACE}.q-gp.com/sms_op_market/show_index
 ## mongodb config
 #spring.data.mongodb.uri=mongodb://192.168.4.50:27017/analysis
 spring.data.mongodb.authentication-database=admin
@@ -124,7 +124,7 @@ xyqb.thirdparty.publickey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCFZxubDMCadSjBw
 xyqb.thirdparty.privatekey=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIIVnG5sMwJp1KMHAALqPDyMXkMkAT3Kx7VjIZ6JqijJ5bexkYAcrbwQ7g/Zq0cHgNCbKCVWgggLDWUzn3zQ6l3WIq3OmNFsM5jRE7VVcaPV1J2yw30nbHcWlX8g2BcCAibvqb5igtpnA0Sxhy4H0Qv4PZWuW0ZoG0fZcgPwV3w5AgMBAAECgYBq9dgVV3Qt1NUZY4UX4H+9DXHoZO98XoMNW0Bmei1msnPnMeNAYtRbodQNRl413i6F2D4PTW1HrcbK4sKNv74kU1jNTSt/OTFleFvAzTQEPQWrxwKAVqt2Z+HtuP9DwE24v2mZ0QpFrsi69ZSorhjvWNs7DB3NvMZaXt8j8LjRDQJBAMKa3P8964pneya9fpCoZqX66Ddwzgp8Qy/N6vECPwCuKaonVFylnXfclP5RcN7kvEmEXb5GrtFEPgK0yBRWtI8CQQCrH8qpqMw8DD83QoucgEy4sbpmc7Croq5FzRilTjVPhaXh0JEIT3XBvzQUwLMqY1x6Iq3qI1bF3dc5V4g49fa3AkEAlTGtJHIQVnenTrgQhE7XA4Es7vQowpkp2UiBSmxyaM8dWjn0z2KZKv+Nqrw9UGUEhUhZpjsCY6Vx9RksG4utuQJBAJi58AuJznXNTGJKbwYHb/HrFXy4xjX5JGbBzLxEV8oYctteZQKwwF1iA959uaocMf4Dk4qDbb985ciUucx0oXMCQGjwlqLb9qK4rQkiDvVL6VC/RTCOi2UWiBaa5ydLKGUrLzS2A8S+VhlsQ8SmvZRyowxctKp96MPXrUMnDAJYT70=
 
 ##分单每日推送查询
-dispatch.baseUrl=http://dispatch.domain.com/
+dispatch.baseUrl=http://dispatch-${NAMESPACE}.q-gp.com/
 
 ## password free login
 ##shuixiang

lua-ui/config/fund-operate-ui.js

@@ -6,4 +6,4 @@ export default {
   clothoContext: '/clotho',
   opLoginUrl: `${opHost}/#/access/login`,
   opSelectSysUrl: `${opHost}/#/access/selectSystem`
-}
\ No newline at end of file
+}

lua-ui/config/h5-ui.js

@@ -5,6 +5,8 @@ var xyqbActiveApi = protocal + "//activity.domain.com";
 var QiNiuHost = protocal + "//ohsx2fi5w.bkt.clouddn.com/";
 var xjdApi= protocal + '//m.domain.com';
 var flowApi= protocal + '//flow.domain.com';
+var mallApi = protocal + "//mallapi.domain.com";
+var mallUrl= protocal + "//new-mall.domain.com";
 var activityId = "98";
 
 
@@ -15,5 +17,7 @@ module.exports = {
   xyqbUserUrl: xyqbUserUrl,
   QiNiuHost: QiNiuHost,
   xjdApi: xjdApi,
-	flowApi: flowApi
+  flowApi: flowApi,
+  mallApi: mallApi,
+  mallUrl: mallUrl
 }
\ No newline at end of file

lua-ui/config/new-op-ui.js

 const protocol = window.location.protocol
 const qiniuHost = 'https://oic74zs8j.qnssl.com/'
 const opapiHost = 'http://opapi.domain.com'
+const activityOpHost ='http://actapi.domain.com'
 let opHost = `${protocol}//new-op.domain.com`
 let opLoginUrl = `${opHost}/#/access/login`
 let opSelectSysUrl = `${opHost}/#/access/selectSystem`
@@ -10,6 +11,7 @@ let domain = ''
 export default{
     qiniuHost,
     opapiHost,
+	activityOpHost,
     opHost,
     opLoginUrl,
     opSelectSysUrl,

lua-ui/config/pinjamancepat-collection-ui.js

@@ -4,7 +4,7 @@ const qiniuHost = 'https://oic74zs8j.qnssl.com/'
 const opapiHost = 'http://pinja-collection-api.domain.com'//测试环境
 // const translateHost = 'http://192.168.165.177:12001' //开发环境 本地起
 const translateHost = 'http://translate.domain.com' //测试环境环境
-let LoginUrl = `${protocol}#/login`  // 登录页
+let LoginUrl = `${protocol}/login`  // 登录页
 let domain = ''
 
 export default{

lua-ui/config/pipeline-ui.js

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

nodejs/business-watcher.js

+const project = 'business-watcher'
+const dir = 'logs'
+
+module.exports = {
+	port: 80,
+  log4js: {
+    appenders: {
+      out: { type: 'stdout' },
+      app: { type: 'dateFile', filename: `${dir}/${project}.log`, daysToKeep: 3, compress: true },
+      error: { type: 'dateFile', filename: `${dir}/${project}.error.log`, daysToKeep: 3, compress: true },
+      just_errors: { type: 'logLevelFilter', appender: 'error', level: 'error' }
+    },
+    categories: {
+      default: { appenders: ['out', 'app', 'just_errors'], level: 'info' }
+    }
+  },
+
+  mongo: {
+    api: 'mongodb://192.168.4.50:27017/monitor'
+  }
+}
\ No newline at end of file

nodejs/op-api.js

@@ -23,8 +23,8 @@ module.exports = {
 		merchant_api: 'http://merchantapi.domain.com',
 		settlement_api: 'http://settlementapi.domain.com',
 		score_api: 'http://scoreapi.domain.com',
-	  quantcube_api: 'http://quantcube-ui.xyqb.com',
-	  ruleEngine_api: 'http://rule-engine.xyqb.com'
+	  quantcube_api: 'http://quantcube-ui.domain.com',
+	  ruleEngine_api: 'http://rule-engine.domain.com'
   },
 
   // 站点相关的配置

nodejs/qg-web.js

+'use strict'
+
+let api = 'http://actapi.domain.com'    // activity-api
+
+export default {
+  api
+}
\ No newline at end of file

nodejs/statistics.js

+const path = require('path')
+const logDir = path.resolve(process.cwd(), './logs')
+
+module.exports = {
+  port: 80,
+
+  logProperty: "collection",
+
+  redis: {
+    api: 'redis://redis:6379/1'
+  },
+
+  LOCK_EXPIRE: 5, // url锁定5s
+  SNAP_EXPIRE: 3 * 24 * 60 * 60, // 缓存3天
+
+  log4js: {
+    appenders: [
+      { type: 'console' }, //控制台输出
+      {
+        type: 'dateFile', // 项目日志
+        filename: `${logDir}/statistics.log`,
+        pattern: '.yyyy-MM-dd',
+        category: 'app',
+        layout: { type: 'basic' }
+      },
+      {
+        type: 'dateFile', // 日志上传
+        filename: `${logDir}/statistics-up.log`,
+        pattern: '.yyyy-MM-dd',
+        category: 'upload',
+        layout: {
+          type: 'pattern',
+          pattern: "%m"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

nodejs/workflow-api.js

@@ -18,6 +18,11 @@ module.exports = {
     database: 'workflow'
   },
   ruleEngine: {
-    host: 'http://192.168.4.15:7104'
+    host: 'http://rule-engine.domain.com'
+  },
+  dingDing: {
+    host: 'https://oapi.dingtalk.com/robot/send?access_token=d98313d2ac9e53b73547d16e251737d85eb39183c4a0c4568c8174125b75c6cd',
+    domain: 'http://workflowapi.domain.com',
+    atMobiles: ["17600200895", "17600200895"]
   }
 }
\ No newline at end of file