From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 010a5d6..4d49e06 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";
@@ -42,7 +43,6 @@
public final static String HB_STATEEXCEPTION = "绾㈠寘鐘舵�佸紓甯�";
public final static String HB_NOEXIST = "绾㈠寘涓嶅瓨鍦�";
public static final int MR_COUNT = 2;
- public static final String HONGBAO_GOODS_PROPORTION = "hongbao_goods_proportion";
public final static String BA_EXIST = "璇ョ被鍨嬭处鎴峰凡瀛樺湪";
public final static String BA_SUCCESS = "鍒涘缓鎴愬姛";
@@ -73,6 +73,10 @@
public static final String MYLIKE = "mylike";
public static final String MYDYNAMIC = "mydynamic";
+ // 鏉ユ簮
+ public static final int SOURCE_TYPE_TAOBAO = 1;
+ public static final int SOURCE_TYPE_JD = 2;
+
public static WXGZConfig wxGZConfig;
// 鐭俊楠岃瘉鐮侀厤缃�
--
Gitblit v1.8.0