Merge branch 'master' of csk/eccs into master

eccs-biz/src/main/resources/oms-config.yml

@@ -11,6 +11,9 @@ oms:
   thirdSn: CW001
   # 生产环境密钥
   md5Salt: IxyIvP0sJqlUZinx
+
+
+#  #==================== 开发环境 ws.ds-bay.com ====================
 #  # 查询商户信息接口
 #  queryMerchantInfoUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryMerchantInfoUrl
 #  # 查询第三方商户信息接口
@@ -37,57 +40,61 @@ oms:
 #  queryShopOutUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopOut
 #  # 查询门店转移接口
 #  queryShopMoveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopMove
-  # 测试环境
+
+
+  #==================== 测试环境 ws.ds-bay.com ====================
   # 查询商户信息接口
-#  queryMerchantInfoUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryMerchantInfoUrl
-#  # 查询第三方商户信息接口
-#  queryThirdMerchantInfoUrl:
-#  # 查询库存接口
-#  queryMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveMng
-#  # 查询门店库存接口
-#  queryShopMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopInveMng
-#  # 查询入库单接口
-#  queryInveReceiptUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
-#  # 查询入库单明细接口
-#  queryInveReceiptDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
-#  # 查询结转接口
-#  queryAdjustmentUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentRecord
-#  # 查询结转明细接口
-#  queryAdjustmentDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentDetail
-#  # 查询出区接口
-#  queryInveShipmentUrl:
-#  # 查询出区明细接口
-#  queryInveShipmentDetailUrl:
-#  # 查询门店进货接口
-#  queryShopInUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopIn
-#  # 查询门店出场接口
-#  queryShopOutUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopOut
-#  # 查询门店转移接口
-#  queryShopMoveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopMove
-  # 生产环境 ws.ds-bay.com
-#  # 查询商户信息接口
-  queryMerchantInfoUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryMerchantInfoUrl
+  queryMerchantInfoUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryMerchantInfoUrl
   # 查询第三方商户信息接口
   queryThirdMerchantInfoUrl:
   # 查询库存接口
-  queryMngInveUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryInveMng
+  queryMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveMng
   # 查询门店库存接口
-  queryShopMngInveUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryShopInveMng
+  queryShopMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopInveMng
   # 查询入库单接口
-  queryInveReceiptUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryInveReceiptGoods
+  queryInveReceiptUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
   # 查询入库单明细接口
-  queryInveReceiptDetailUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryInveReceiptGoods
+  queryInveReceiptDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
   # 查询结转接口
-  queryAdjustmentUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryAdjustmentRecord
+  queryAdjustmentUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentRecord
   # 查询结转明细接口
-  queryAdjustmentDetailUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryAdjustmentDetail
+  queryAdjustmentDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentDetail
   # 查询出区接口
   queryInveShipmentUrl:
   # 查询出区明细接口
   queryInveShipmentDetailUrl:
   # 查询门店进货接口
-  queryShopInUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryShopIn
+  queryShopInUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopIn
   # 查询门店出场接口
-  queryShopOutUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryShopOut
+  queryShopOutUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopOut
   # 查询门店转移接口
-  queryShopMoveUrl: http://120.76.26.84:8680/al/queryOmsInfo/queryShopMove
+  queryShopMoveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopMove
+
+
+#  #==================== 生产环境 ws.ds-bay.com ====================
+#  # 查询商户信息接口
+#  queryMerchantInfoUrl: http://39.108122.249:8680/al/queryOmsInfo/queryMerchantInfoUrl
+#  # 查询第三方商户信息接口
+#  queryThirdMerchantInfoUrl:
+#  # 查询库存接口
+#  queryMngInveUrl: http://39.108122.249:8680/al/queryOmsInfo/queryInveMng
+#  # 查询门店库存接口
+#  queryShopMngInveUrl: http://39.108122.249:8680/al/queryOmsInfo/queryShopInveMng
+#  # 查询入库单接口
+#  queryInveReceiptUrl: http://39.108122.249:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询入库单明细接口
+#  queryInveReceiptDetailUrl: http://39.108122.249:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  # 查询结转接口
+#  queryAdjustmentUrl: http://39.108122.249:8680/al/queryOmsInfo/queryAdjustmentRecord
+#  # 查询结转明细接口
+#  queryAdjustmentDetailUrl: http://39.108122.249:8680/al/queryOmsInfo/queryAdjustmentDetail
+#  # 查询出区接口
+#  queryInveShipmentUrl:
+#  # 查询出区明细接口
+#  queryInveShipmentDetailUrl:
+#  # 查询门店进货接口
+#  queryShopInUrl: http://39.108122.249:8680/al/queryOmsInfo/queryShopIn
+#  # 查询门店出场接口
+#  queryShopOutUrl: http://39.108122.249:8680/al/queryOmsInfo/queryShopOut
+#  # 查询门店转移接口
+#  queryShopMoveUrl: http://39.108122.249:8680/al/queryOmsInfo/queryShopMove