Merge branch 'master' of http://gitabc.xyqb.com/QA/config_repository

java/black-hole.properties

@@ -24,6 +24,7 @@ usersys.url=http://192.168.4.153:7042
 # 
 fdfs.url=172.16.3.63:22122
 
+
 ####### The lack of config #######
 # email
 contract.mail.tomail=bin.zhang@quantgroup.cn

java/merchant-backend.properties

@@ -21,4 +21,11 @@ rabbitmq.connection.password=qatest
 
 ####### backend service depend ######
 # xyqb-mall
-mall.notify.url=http://xyqb-mall
\ No newline at end of file
+mall.notify.url=http://xyqb-mall
+
+
+####### The lack of config #######
+rabbitmq.connection.queue.jdOrder=jdOrder
+jd.query.url=192.168.4.241/api
+mall.price.query.url=http://192.168.4.72:7019/ex/3c/getPrice?price=
+merchant.schedule.execute=0
\ No newline at end of file

java/xyqb-mall.properties

@@ -89,4 +89,37 @@ bt.activate.return.url=http://localhost
 bt.pay.return.url=http://localhost
 
 ####### The lack of config #######
-rabbitmq.connection.queue.jdOrder=jdOrder
\ No newline at end of file
+rabbitmq.connection.queue.jdOrder=jdOrder
+bt.private-key=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8oQo634gkfq/a
+8DbLeWPgED4TGL10roKGiXixLzk1rpuvQjTcobhCDtbkoD0Kxa08zTsDEGLOvlCw
+K3sK9P8clQ2zyHFIF+x5b96gvo8PC+CN9oCUZD+Gtp2qfOZTdz3NrXcTpCaPriz5
+m42iDSWxq+VspeUynmuK/hF3qpnkFcFGoHzMSGqB0uZblBX09inxc1uZxG/9dG0V
+VCBKeKCmyVUolEKLRG4a5ivQkyTcSD7tk9iFgDpjfnFjoXcufqUaSOrWE6ForNMc
+WTFMHQe7WPPp77F9Wspa3ur4HznzXfrulMrFt5zeWzKWYj6BQ54cO0Ofoa29ybwz
++ulX9jTrAgMBAAECggEAJqj658YYqSIt+LlzAZEHn0y07EUNz3RU3C4gxm/fUdlP
+n0P6gZ3DngZclM8is6qALw4BIkeheK4Y64J93WkJQFpsTISwcw40MU90WY201Gii
+xXXYNJG3U2zqM58VtdWinR0IYsYqARi5rw7qoGQBbcDFbNczeoRtljcsbVJR6CUT
+MLDTt8QIy6105Iddg/sGMquJcDtqAudI1Ulv0oRR97oRzUOOMKVceva35zm5Ud9B
++BkVHNnrQ7L9i20BE7KZ340mruUb+87WvOeM3CuSmkc0UJmiBskUp1ENy0CYt8Yw
+jrGpSCbr3PVlgbgLYYbaB//Yj8oOidXBrlNt3GpTAQKBgQDixOWt4Ry1YJ4ZLmBr
+kqAworNKpxBuPf8Y5tjQpukNJhKE0yUzhQy99iBYy8/wbnQzQPHz166i3Ln+XREX
+YTo/Xvbkhq2hY5AmqEGCQIPBV9D98hcGIqCdZma3DL2sWLiv5QK9uZeP6iv/uuf8
+hkNkeP/tg45rgMZJhTN4Tk7HOwKBgQDU8ZFAf67Sj+8cbIyEgeMfAxdarCsyax3k
+LiIrlIonecakSDgaYSzq1sx6eMMxxLnmVMAixjuOun0RoFv9mL8u9A74grWJExXq
+lzGSATjvrGDNahY3xdsLQEqrOQUUYctnm+asWIJ4hmF3o5EvC0XWP3rA/9FsPxDz
+cYpfgaVOEQKBgH/xd2TTTc9H4+txLxWCdL78DQxhlfOdJwB1vn56raKtiGVIfATF
+XJsQ8s8mrvuIVidUzS420mExB/9rouj+Ak8e1U26btxPwFUPOWaz36KGWXPt0u+z
+OcuUqv88QQesRwd2vkUtIUYhaRGv8pOXbQ6S9lKblw8waK+yZ4fJJslhAoGAUcaz
+UWG3cYV0/iVxkTGQV0iIn3me3S3lvMs6tCHHLIHHly9k3DyVU1pKDH5z95jlC19g
+qfoWxSk4/pvmt+0A/rcbSLRposqBkCWgE8IEa4Z3ZmtnPOPuytNV2Yt8N+eWhaOJ
+YoZbFI4GwDtAdiCOIUkfix6y/i76A4OG8EaJhQECgYEAyzIvQZ263d+hg0J/cN5W
+l/iZNeKDHJ4qJmnUaxmamfsnkTDUg3dh7ilX1HA2B44cco3Nq75tCukwJxrFkxNL
+hdzsa4bdU7kLfNeaYgBmRPRyx20j6pGlMacy7P/gjozvny2CP1ENBn9PoJ3FCbWd
+2FOEQpaYTFyvADAntq7xh4w=
+bt.public-key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxY60vgdVaeV0rzgohSpH
+df7gTThvzeH5USClexUl+wsyelu7HbQuiRJMWs4TAJyad/RvGYZd1ihNq5cMNQ9u
+HxzjB/545ebG+bGQT3GXU0iIf3Qv9G0d32jAx+fQU9hBSnoMnCcSWZR1zUyMSShN
+MSOro1bjCtyP4Tx8TM5GtoXdQlSo9cPzI33xrHNFgF3u6KtBMLT9Z4XWdojAeeAo
+ZLD1JJ9bo/Vzp9squx4VyZlwjP46BNJmGxrcQ/JihXJJnxJ7CopNqdRY9dNJVbyw
+onJqSCOhnEv9LrnsjbKGAKeQ+vP3uT6EYhg5wGVh5yw4CTV3mnRgak/D0cc+is9L
+RwIDAQAB
\ No newline at end of file