From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 16 ++++++++++++----
1 files changed, 12 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 d3963d8..bc5aad2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -1,6 +1,10 @@
package com.yeshi.fanli.util;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
+
+import org.yeshi.utils.annotation.MapUtil;
import com.yeshi.fanli.entity.config.AlipayConfig;
import com.yeshi.fanli.entity.config.ConstantConfig;
@@ -9,7 +13,6 @@
import com.yeshi.fanli.entity.config.WXGZConfig;
import com.yeshi.fanli.entity.config.ZNXConfig;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.annotation.MapUtil;
public class Constant {
public static boolean IS_TASK = false;
@@ -96,6 +99,11 @@
public static final int TYPE_SHAER = 2;
// 閭�璇�
public static final int TYPE_INVITE = 3;
+
+ // 鍙ｄ护鏈夋晥鏈�-澶�
+ public static final int TOKEN_DAYS = 1;
+ // 璧犻�佹湁鏁堟湡-澶�
+ public static final int GIVE_DAYS = 1;
public static WXGZConfig wxGZConfig;
@@ -161,12 +169,12 @@
public static final String WEBPAGE_SIGN_KEY = "@?,223Hbb88lll";
- // public static final String TAOKE_ANDROID_APPKEY = "24587154";
- // public static final String TAOKE_IOS_APPKEY = "24838852";
-
// 鏂颁汉鎶藉-鏈�澶ф鏁�
public static final int MAX_COUNT_LOTTERY_NEWBIES = 5;
+ // 绾跨▼绛夊緟鏁伴噺
+ public static Set<Long> waitingThreadSet = new HashSet<>();
+
static {
if (smsConfig == null) {
--
Gitblit v1.8.0