Merge remote-tracking branch 'origin/master'

.gitignore

+.idea
\ No newline at end of file

.idea/compiler.xml

-<?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

.idea/config_repository.iml

-<?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

.idea/copyright/profiles_settings.xml

-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file

.idea/encodings.xml

-<?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

.idea/misc.xml

-<?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

.idea/modules.xml

-<?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

.idea/vcs.xml

-<?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

java/pipes.properties

@@ -9,7 +9,7 @@ pipes.rabbitmq.username=qa
 pipes.rabbitmq.password=qatest
 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.port=6379
@@ -19,9 +19,9 @@ logging.file=/home/quant_group/logs/pipes.log
 
 #=======
 plugin.jenkins.host=http://192.168.4.96:8080
-plugin.jenkins.username=wentao.suo
+plugin.jenkins.username=enhua.tan
 plugin.jenkins.password=
-plugin.jenkins.token=6ac1030b23f49c5fb007a1e9870952ce
+plugin.jenkins.token=ddda66d011a2eaa883348463b4f9dd1b
 
 plugin.sonar.host=http://sonar.quantgroups.com
 plugin.sonar.username=admin

java/urge_dispatcher.properties

@@ -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
 
 # 测试环境 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.password=2pVoIvexk3ZLvvyv
 data.source.dispatcher.maxPoolSize=20
@@ -68,8 +68,8 @@ data.source.collection.maxPoolSize=10
 
 #测试环境redis host
 dispatcher.data.redis.defaultExpiration=3600
-dispatcher.redis.master.host=redis
-dispatcher.redis.master.port=6379
+dispatcher.redis.master.host=192.168.6.16
+dispatcher.redis.master.port=20471
 dispatcher.redis.master.name=
 dispatcher.redis.sentinel1.host=
 dispatcher.redis.sentinel1.port=1
@@ -81,9 +81,9 @@ dispatcher.redis.sentinel3.port=1
 
 # 全部换成测试环境的配置api host config 都要换成测试环境
 model.api.host=http://model.quantgroup.cn
-passport.api.host=http://192.168.4.26:7042
-paycenter.api.host=http://192.168.4.26:7006
-cashLoan.api.host=http://192.168.4.26:7003
+passport.api.host=http://passportapi.domain.com
+paycenter.api.host=http://payapi.domain.com
+cashLoan.api.host=http://api.domain.com
 cashLoan.api.host.v2=http://172.16.4.69:9004
 
 
@@ -113,7 +113,7 @@ dachui.api.loginId=yunche
 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.url.batch.repaymentQuery=http://172.30.5.51:9004/ex/repayment/view
@@ -129,4 +129,10 @@ ud.zk.job.connectionTimeoutMilliseconds=1000
 
 
 # 新审核系统 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

lua-ui/config/after_loan_manage_ui.js

-const apiHost = '${protocol}//cuishou.domain.com'
+const protocol = window.location.protocol
+const apiHost = `${protocol}//cuishou.domain.com`
 const serviceHost = apiHost + '/service'
-const urgeApiHost = '${protocol}//urge.domain.com'
+const urgeApiHost = `${protocol}//urge.domain.com`
 
 export default {
     serviceHost,
     urgeApiHost
 }
-/**
- * Created by mengluoyong on 2018/8/22.
- */

lua-ui/config/division-ui.js

+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

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,

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

@@ -7,7 +7,7 @@ module.exports = {
   XyqbUserUrl: protocal + '//passport.domain.com',
   px2rem: 100,
   domain: domain,
-  weixinAppid:'wx0a7c0bce0c3ac523',
+  weixinAppid:'wx7188560d6923088d',
   weixinUri:encodeURIComponent('https://passportapi.domain.com/wechat/active_redirect'),
   rentingApi:protocal + "//api.domain.com",
   rentingUrl:protocal + "//activity.domain.com",

lua-ui/config/new-xyqb-user-ui.js

 let protocol = window.location.protocol
 module.exports = {
     api: protocol + "//passportapi2.domain.com",
-    weixinAppid: 'wx7188560d6923088d', //'wx89894cd83d117b26'
+    weixinAppid: 'wx7188560d6923088d', //'wx7188560d6923088d'
     weixinUri: protocol + '//passportapi.domain.com/wechat/receiveCode/extdata/',                 
     test: true,
     domain: "passport.domain.com"

lua-ui/config/quant-compute-ui.js

+
+const protocol = window.location.protocol
+
+const opapiHost = `${protocol}//opapi.domain.com`
+const lzsApiHost = `${opapiHost}/lzs`
+
+export default {
+  opapiHost,
+  lzsApiHost
+}

nodejs/op-api.js

@@ -9,7 +9,7 @@ module.exports = {
     btCapital_api: 'http://fundmanage.domain.com',
     btDirect_api: 'http://internal.btzt.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',
     userCenter_api: 'http://passportapi2.domain.com',
     zbj_api: 'http://taurus.quantgroup.cn/',
@@ -18,13 +18,14 @@ module.exports = {
     msgTmp_api: 'http://192.168.4.3:8051',
     msgPush_api: 'http://message-center-op',
     statistics_api: 'http://statisticsapi.domain.com',
-	  clotho_api:'http://clotho.domain.com',
-		fe_es_api:'http://192.168.4.51:9200',
+    clotho_api: 'http://clotho.domain.com',
+    fe_es_api: 'http://192.168.4.51:9200',
     merchant_api: 'http://merchantapi.domain.com',
     settlement_api: 'http://settlementapi.domain.com',
     score_api: 'http://scoreapi.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,6 +35,7 @@ module.exports = {
   },
 
   userCenter: 'http://op.domain.com',
+  newUserCenter: 'http://op.domain.com',
 
   // mongo配置
   mongo: {
@@ -63,6 +65,8 @@ module.exports = {
   // 七牛配置
   qiniu: {
     domain: 'http://opapi.domain.com',
+    cdn_domain: 'https://oic74zs8j.qnssl.com',
+    refresh_api: 'http://fusion.qiniuapi.com/refresh',
     ACCESS_KEY: 'QyjX3i2tEMvrv50j6M_wpb9YoFJbxSm3jEkOj9lY',
     SECRET_KEY: 'uoMTzRLoElTAKXVzelGgTvI652zJ8bCz_qqTtoGl',
     BUCKET: 'app-sync',