Merge branch 'master' of zcb/eccs into master

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

@@ -1,8 +1,22 @@
 kmall:
+    # 开发环境地址
+#  # 查询所有库存接口
+#  queryAllInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllGoodsInfo
+#  # 查询门店库存接口
+#  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
+#  # 发送请求
+#  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
+  # 测试环境地址
   # 查询所有库存接口
-  queryAllInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllGoodsInfo
+  queryAllInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllGoodsInfo
   # 查询门店库存接口
-  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
+  queryAllShopInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllStoreProductInfo
   # 发送请求
-  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
+  requestToKmall: http://183.62.225.124:8080/ktoeccs/sendToEccs
+#   生产环境地址
+#  queryAllInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllGoodsInfo
+#  # 查询门店库存接口
+#  queryAllShopInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllStoreProductInfo
+#  # 发送请求
+#  requestToKmall: http://8.135.102.238:8080/ktoeccs/sendToEccs
 

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

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