From f7ed4e6bbe9be95d268481e66d70d90e70e07e12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 一月 2019 19:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 2329b63..573eae5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -73,20 +73,22 @@
 	public static final String MYLIKE = "mylike";
 	public static final String MYDYNAMIC = "mydynamic";
 
-	
+	public static final String TAOBAO_AUTH_APPKEY = "24980167";
+	public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
+	public static final String TAOBAO_RELATION_PID_DEFAULT = "mm_124933865_56750082_87140050199";
+	public static final String TAOBAO_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_89555600043";
+
 	// 鏉ユ簮-娣樺疂
 	public static final int SOURCE_TYPE_TAOBAO = 1;
 	// 鏉ユ簮-浜笢
 	public static final int SOURCE_TYPE_JD = 2;
-	
+
 	// 鑷喘-杩斿埄
-	public static final int TYPE_REBATE= 1;
+	public static final int TYPE_REBATE = 1;
 	// 鍒嗕韩
 	public static final int TYPE_SHAER = 2;
 	// 閭�璇�
 	public static final int TYPE_INVITE = 3;
-	
-	
 
 	public static WXGZConfig wxGZConfig;
 

--
Gitblit v1.8.0