Merge remote-tracking branch 'origin/dev-main' into dev-main

# Conflicts:
#	pom.xml
This commit is contained in:
fuhouyin 2024-02-02 10:28:00 +08:00
commit eef25ac39f

View File

@ -6,11 +6,18 @@ package com.darkness.common.pojo;
public class PublicConst {
// 索引名称
public final static String E_ACTUAL_POPULATION_INDEX_NAME = "e_actual_population_index_name";
// 索引类型
public final static String ES_INDEX_TYPE = "doc";
// es 最大查询条数
public static final Integer EVENT_SYNTHETICAL_ESMAXCOUNT = 10000;
// ES 统一配置
public final static String
ES_SETTING_SETTINGPATH = "es/settings.json",
ES_SETTING_NORMALIZER_LOWERCASE = "lowercase"; // 忽略大小写
// 分片数
public final static short ES_SHARDS = 1;
@ -19,17 +26,14 @@ public class PublicConst {
// 删除标识位0:未删除 1:已删除
public static final Byte DELETE_FLAG_ZERO = 0,
DELETE_FLAG_ONE = 1,
DELETE_FLAG_TWO = 2,
DELETE_FLAG_TREE = 3,
DELETE_FLAG_FAIL = -1;
DELETE_FLAG_ONE = 1;
// 日期格式化
public static final String DATE_FORMAT_YMD_HMS = "yyyy-MM-dd HH:mm:ss",
DATE_FORMAT_YMD = "yyyy-MM-dd";
// 一天的结束时间
public static final String DAY_END_TIME = "23:59:59";
public static final String DAY_END_TIME = " 23:59:59";
// 电话号码和手机号正则
public static final String REGX_TELANDPHONE = "^([1]\\d{10}|([\\(]?0[0-9]{2,3}[\\)]?[-]?)?([2-9][0-9]{6,7})+(\\-[0-9]{1,4})?)$";
@ -45,15 +49,11 @@ public class PublicConst {
SYMBOL_8 = "(",
SYMBOL_9 = ")";
// es 最大查询条数
public static final Integer EVENT_SYNTHETICAL_ESMAXCOUNT = 10000;
// 项目名
public static final String PROJECT_NAME = "darkness";
// ES 统一配置
public final static String
ES_SETTING_SETTINGPATH = "es/settings.json",
ES_SETTING_NORMALIZER_LOWERCASE = "lowercase"; // 忽略大小写
}