From 237794cca5d458376a9de0f3590ea850d45e2499 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 11:17:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 bab6ab1..9c9d513 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -12,7 +12,6 @@
public class Constant {
public static boolean IS_TASK = false;
-
// 澶栫綉鐜
public static boolean IS_OUTNET = false;
@@ -23,6 +22,8 @@
};
public final static String UIDAESKEY = "WW782ss@8*px/%2v";
+
+ public final static String ADMINH5_AESKEY = "WW782Ss@0*px/,2v";
public final static String RANDKEY = "user_randkey";
public final static String RANDPWDKEY = "user_pwd_randkey";
@@ -72,6 +73,29 @@
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_SHAER = 2;
+ // 閭�璇�
+ public static final int TYPE_INVITE = 3;
+
public static WXGZConfig wxGZConfig;
// 鐭俊楠岃瘉鐮侀厤缃�
--
Gitblit v1.8.0