From 11c098089f8c4714188e91032e5a19e8fe94bf96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 22 八月 2019 09:26:52 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/Constant.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 96941af..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,11 +169,11 @@
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 {
@@ -196,7 +204,7 @@
if (znxConfig == null) {
Properties ps = org.yeshi.utils.PropertiesUtil
- .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("znx_msg.properties"));
+ .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("push_msg.properties"));
znxConfig = (ZNXConfig) MapUtil.parseMap(ZNXConfig.class, ps);
}
@@ -207,10 +215,10 @@
IS_OUTNET = Boolean.parseBoolean(constantConfig.getOutNetWork());
IS_TASK = Boolean.parseBoolean(constantConfig.getTask());
IS_TEST = Boolean.parseBoolean(constantConfig.getTest());
-
- System.out.println("IS_OUTNET:"+IS_OUTNET);
- System.out.println("IS_TASK:"+IS_TASK);
- System.out.println("IS_TEST:"+IS_TEST);
+
+ System.out.println("IS_OUTNET:" + IS_OUTNET);
+ System.out.println("IS_TASK:" + IS_TASK);
+ System.out.println("IS_TEST:" + IS_TEST);
}
Extract_Activty = String.format("%s.ui.mine.MyRedPacketsActivity",
@@ -218,4 +226,26 @@
HB_Activity = String.format("%s.ui.main.MainActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName());
}
+
+ public static String getSourceName(int sourceType) {
+ switch (sourceType) {
+ case SOURCE_TYPE_TAOBAO:
+ return "娣樺疂";
+ case SOURCE_TYPE_JD:
+ return "浜笢";
+ case SOURCE_TYPE_PDD:
+ return "鎷煎澶�";
+ default:// 鍏朵粬绫诲瀷
+ return "";
+ }
+ }
+
+ public static int getPlatformCode(String platform) {
+ if ("android".equalsIgnoreCase(platform))
+ return 1;
+ else if ("ios".equalsIgnoreCase(platform))
+ return 2;
+ else
+ return 0;// 鏈煡
+ }
}
--
Gitblit v1.8.0