From 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 10:28:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 21 ++++++++++++++++-----
1 files changed, 16 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..520cdc3 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,28 @@
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 String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙ｉ櫎灏佺璇疯仈绯诲鏈�";
+
+ // 鐢ㄦ埛琚皝绂�
+ public static final int CODE_FORBIDDEN_USER = 80001;
+
// 鏉ユ簮-娣樺疂
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;
@@ -153,6 +161,9 @@
// public static final String TAOKE_ANDROID_APPKEY = "24587154";
// public static final String TAOKE_IOS_APPKEY = "24838852";
+ // 鏂颁汉鎶藉-鏈�澶ф鏁�
+ public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
+
static {
if (smsConfig == null) {
--
Gitblit v1.8.0