From b56c7f8fa63e0150f621b02f425053ce0d48c2f1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 01 十一月 2019 11:40:05 +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 | 124 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 116 insertions(+), 8 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 27c92ef..5a60248 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -1,25 +1,29 @@
package com.yeshi.fanli.util;
+import java.math.BigDecimal;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
+import org.yeshi.utils.annotation.MapUtil;
+
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.config.AlipayConfig;
+import com.yeshi.fanli.entity.config.ConstantConfig;
import com.yeshi.fanli.entity.config.SMSConfig;
import com.yeshi.fanli.entity.config.SystemCommonConfig;
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;
// 澶栫綉鐜
- public static boolean IS_OUTNET = true;
+ public static boolean IS_OUTNET = 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";
@@ -75,11 +79,30 @@
public static final String TAOBAO_AUTH_APPKEY = "24980167";
public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
+ public static final String TAOBAO_RELATION_PID_DEFAULT = "mm_124933865_56750082_87140050199";
+ public static final String TAOBAO_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_89555600043";
+
+ // 濂栧姳鍒告渶楂樻瘮渚�
+ public static final BigDecimal MAX_REWARD_RATE = new BigDecimal("0.35");
+
+ // 杩斿洖缁欏鎴风鐨勮处鍙峰皝绂佹彁绀鸿
+ public static final String FORBIDDEN_USER_REASON_DESC = "浣犵殑璐﹀彿鎴栫粦瀹氱殑绗笁鏂硅处鍙峰凡琚皝绂侊紝灏佺鍘熷洜鍙湪甯姪涓績鐨勭浉鍏宠鍒欎腑鍙傜湅锛屽鏈夌枒闂垨鐢宠瘔瑙ｉ櫎灏佺璇疯仈绯诲鏈�";
+
+ // 鐢ㄦ埛琚皝绂�
+ public static final int CODE_FORBIDDEN_USER = 80001;
// 鏉ユ簮-娣樺疂
public static final int SOURCE_TYPE_TAOBAO = 1;
// 鏉ユ簮-浜笢
public static final int SOURCE_TYPE_JD = 2;
+ // 鏉ユ簮-鎷煎澶�
+ public static final int SOURCE_TYPE_PDD = 3;
+ // 鏉ユ簮-鍞搧浼�
+ public static final int SOURCE_TYPE_WPH = 4;
+ // 鏉ユ簮-鑻忓畞
+ public static final int SOURCE_TYPE_SUNING = 5;
+ // 鏉ユ簮-楗夸簡涔�
+ public static final int SOURCE_TYPE_ELME = 6;
// 鑷喘-杩斿埄
public static final int TYPE_REBATE = 1;
@@ -88,6 +111,30 @@
// 閭�璇�
public static final int TYPE_INVITE = 3;
+ // 鍙ｄ护鏈夋晥鏈�-澶�
+ public static final int TOKEN_DAYS = 1;
+ // 璧犻�佹湁鏁堟湡-澶�
+ public static final int GIVE_DAYS = 1;
+
+
+ // 寰俊鑷姩鎻愮幇閲戦
+ public static final int AUTO_EXTRACT_MONEY = 1;
+ // 寰俊鑷姩鎻愮幇鏈�浣庝綑棰�
+ public static final int AUTO_EXTRACT_MIN_SURPLUS = 2;
+
+
+ // 绾㈠寘濂栧姳闅忔満鑼冨洿
+ public static final double RED_PACK_RANDOM_MIN = 0.5;
+ public static final double RED_PACK_RANDOM_MAX = 2;
+ // 绾㈠寘濂栧姳璁㈠崟瀹炰粯娆炬渶浣�
+ public static final BigDecimal RED_PACK_PAY_MIN = new BigDecimal("10");
+ // 绾㈠寘濂栧姳鍒嗕韩璁㈠崟杩炵画濂栧姳鏈堟暟
+ public static final int RED_PACK_REWARd_MONTH = 15;
+ // 绾㈠寘濂栧姳-鍗曚綅鏃堕棿绫荤疮璁′骇鐢熲墺200閲戝竵
+ public static final long RED_PACK_GOLD_COIN = 200;
+
+
+
public static WXGZConfig wxGZConfig;
// 鐭俊楠岃瘉鐮侀厤缃�
@@ -99,6 +146,8 @@
public static AlipayConfig alipayConfig;
public static ZNXConfig znxConfig;
+
+ public static ConstantConfig constantConfig;
/**
* 娣樺疂鍟嗗搧绾㈠寘
@@ -140,7 +189,7 @@
*/
public static final String BINDUSER = "2";
/**
- * 杩斿埄鍒哥郴缁熺殑ID锛堝畨鍗擄級
+ * 绯荤粺鐨処D锛堝畨鍗擄級
*/
public static final long FANLI = 4;
/**
@@ -150,8 +199,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 {
@@ -182,8 +234,21 @@
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);
+ }
+
+ if (constantConfig == null) {
+ Properties ps = org.yeshi.utils.PropertiesUtil
+ .getProperties(TaoBaoUtil.class.getClassLoader().getResourceAsStream("constant.properties"));
+ constantConfig = (ConstantConfig) MapUtil.parseMap(ConstantConfig.class, ps);
+ 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);
}
Extract_Activty = String.format("%s.ui.mine.MyRedPacketsActivity",
@@ -191,4 +256,47 @@
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 "鎷煎澶�";
+ case SOURCE_TYPE_WPH:
+ return "鍞搧浼�";
+ case SOURCE_TYPE_SUNING:
+ return "鑻忓畞";
+ case SOURCE_TYPE_ELME:
+ 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;// 鏈煡
+ }
+
+ public static String getAppName(String platform, String version) {
+ // if (VersionUtil.greaterThan_2_0(platform, version))
+ return Constant.systemCommonConfig.getProjectChineseName();
+ // else
+ // return "杩斿埄鍒�";
+ }
+
+ public static WXAccountInfoDTO getWXAccount(String platform, String version) {
+ // return new WXAccountInfoDTO("wx43617e2ed82c5b28",
+ // "f8a65908fb4681bdd181de70f6ab9a3b", "wx5c0d167c6e3ad726",
+ // "0c79d5869bb0f2d7c13e43f9a18f440d");
+ return new WXAccountInfoDTO("wxa99686bb65a9f466", "57390718ddedaa1591f6876cdcf96f43", "wx5c0d167c6e3ad726",
+ "0c79d5869bb0f2d7c13e43f9a18f440d");
+ }
}
--
Gitblit v1.8.0