From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 accdcdc..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,17 +12,18 @@
public class Constant {
public static boolean IS_TASK = false;
-
// 澶栫綉鐜
- public static boolean IS_OUTNET = true;
+ public static boolean IS_OUTNET = false;
- public static boolean IS_TEST = false;
+ public static boolean IS_TEST = true;
public static int PAGE_SIZE = 20;
public static int[] TASK_TYPE = { 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008// 寰俊浠诲姟绫诲瀷缂栧彿
};
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