From 70f01fd17bb642c2f773d5c5567018d7573a2dde Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 12 Mar 2021 17:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/resources/application.properties |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/resources/application.properties b/blade-service/blade-jfpts/src/main/resources/application.properties
index df4d6a4..68a5e78 100644
--- a/blade-service/blade-jfpts/src/main/resources/application.properties
+++ b/blade-service/blade-jfpts/src/main/resources/application.properties
@@ -5,10 +5,12 @@
 
 #�����ӿ���Կ��������
 PARCEL_KEY=X-AISP-T
-PARCEL_SECRET=A3_2f718467f64b82e7a3cb38bf77702c2a1615339643687
+#PARCEL_SECRET=A3_2f718467f64b82e7a3cb38bf77702c2a1615339643687
+PARCEL_SECRET=A3_a10f15e56deefe37913884d98d3e9df31615529561666
 
 #��ѯij�ڼ��Υ����Ʒͳ�� URL
-PARCEL_CONTRABAND_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayContrabandStat
-
+#PARCEL_CONTRABAND_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayContrabandStat
+PARCEL_CONTRABAND_URL=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/queryMachineDayContrabandStat
 #��ѯij�ڼ�İ���ͳ�� URL
-PARCEL_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayStat
+#PARCEL_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayStat
+PARCEL_URL=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/queryMachineDayStat

--
Gitblit v1.9.3