From 324aea6f8b2d36ea5b6fc1b03d29ad8dfae40259 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 23 一月 2019 18:06:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 4a391fb..27c92ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -13,7 +13,7 @@
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;
@@ -72,25 +72,21 @@
public static final String EXTRACT_MIN_MONEY = "extract_min_money";
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_AUTH_APPKEY = "24980167";
+ public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
+
// 鏉ユ簮-娣樺疂
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;
--
Gitblit v1.8.0