From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/util/Constant.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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..c17c1e0 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 = false;
+	public static boolean IS_OUTNET = true;
 
-	public static boolean IS_TEST = true;
+	public static boolean IS_TEST = false;
 
 	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";
@@ -72,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