更新配置

java/merchant-backend.properties

+##############
+#security
+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
+
+merchant.security.allowedRoutes=/operate/**,/inner/mall/**,/jd_category/**,/jd_brand/**,/ex/data/query/**,/**.html,/**.js,/product/**,/goodscreate/*,/mgr/digital/**,/category/*,/recommend_product/**,/merchant/*,/merchantmgr/active_refund_close,/property/*,/user/add_merchant,/merchantmgr/fix_history,/merchantmgr/user_activity_cancel,/faster_entrance/*,/user/update_user_password,/merchantmgr/update_jd_after_order_no,/merchantmgr/update_jd_order_status,/jdmgr/export_jdorder_lists,\
+ /album/**,/commodity_salogan/**,/navigation/**,/life_entrance/**,/brand_recommend/**,/sale_product/*,/home_config/*,/brand/**,/jdmgr/*,/search_word/*,/default_word/*
+
+
 ########### mysql ###########
 merchant.data.mysql.jdbc-url=jdbc:mysql://db:3306/merchant?useUnicode=true&characterEncoding=UTF8
 merchant.data.mysql.user=qa
@@ -5,6 +14,9 @@ merchant.data.mysql.password=qatest
 mall.data.jdbc-url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=UTF8
 mall.data.user=qa
 mall.data.password=qatest
+mall.data.unique-name=mallDatasource
+mall.data.max-pool-size=100
+mall.data.min-pool-size=10
 
 
 ########### redis ###########
@@ -18,14 +30,39 @@ rabbitmq.connection.port=5672
 rabbitmq.connection.user=qa
 rabbitmq.connection.password=qatest
 
+rabbitmq.connection.virtual-host.mall=mall
+rabbitmq.connection.queue.mallOrder=mallOrder
+rabbitmq.mall.exchange=digital
+rabbitmq.connection.queue.deliver=deliver
+rabbitmq.connection.queue.receiveRefund=refund
+rabbitmq.connection.queue.sendRefund=refundFeed
+rabbitmq.connection.queue.jdOrder=jdOrder
 
 ####### backend service depend ######
 # xyqb-mall
 mall.notify.url=http://xyqb-mall
-
+mall.notify.key=YthUiaVzdbhA0rKHNAHrDWNCDlOTj21K
 
 ####### 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
+regExp=^/bill_order_detail/.*|/bill_order/.*|/settlement/.*$
+
+#访问商品获取分期价格
+mall.price.query.url=http://xyqb-mall/ex/3c/getPrice?price=
+#新增定时任务配置
+merchant.schedule.execute=1
+jd.query.url=http://mock.q-gp.com/api
+
+
+#excel path
+merchant-bankend.tmp-path=/home/quant_group/project/
+
+usersys.url=http://xyqb-user
+xyqb.merchant.isdebug=1
+
+product_sku_image_path=https://oic74zs8j.qnssl.com/
+
+
+#运营后台优化新增配置
+rabbitmq.refresh.exchange=refresh_cache
+rabbitmq.connection.queue.appbackend_refresh=appbackend_refresh
+rabbitmq.connection.queue.h5_refresh=h5_refresh
\ No newline at end of file