diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index ae1e2045d..7a713b7cf 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -322,56 +322,18 @@ public final class Constants { // public static final boolean IS_USE_HIVE_DB = // Configurations.getBooleanProperty("isUseHiveDb", true); - /** - * 是否获取数据中心查询记录的总条数 - */ - - public static final boolean IS_GET_HIVECOUNT = Configurations.getBooleanProperty("isGetHiveCount", true); - /** - * 是否获取数据中心[神通]查询记录的总条数 - */ - - public static final boolean IS_SELECT_CLUSTER = Configurations.getBooleanProperty("isSelectCluster", false); - - /** - * 神通数据库A的数据最早时间 - */ - public static final Long CLUSTER_A_START_TIME = Configurations.getLongProperty("clusterAStartTime", new Date().getTime()); - - /** - * 神通数据库B的数据最早时间 - */ - public static final Long CLUSTER_B_START_TIME = Configurations.getLongProperty("clusterBStartTime", new Date().getTime()); - /** * 每次获取数据中心多少条数据,咱们在对获取的数据进行分页处理 */ public static final Long EVERY_GETHIVEDATANUM = Configurations.getLongProperty("everyGetHiveDataNum", 10000); - /** - * 是否开启基础校验 - */ - public static final boolean BASE_VALIDATE = Configurations.getBooleanProperty("baseValidate", true); public static final Long DATACENTER_TIME = Configurations.getLongProperty("dataCenterTime", 48); - /** - * 是否开启业务校验 - */ - public static final boolean SERVICE_VALIDATE = Configurations.getBooleanProperty("serviceValidate", true); - /** - * 日志本地存储时间 - */ - public static final Long LOG_LOCAL_TIME = Configurations.getLongProperty("logLocalTime", 48); - /** - * 实时统计默认时间 - */ - public static final Long REPORT_LOCAL_TIME = Configurations.getLongProperty("reportLocalTime", 1); /** * 日志是否从hive中查询 */ - public static final boolean SEL_FROM_HIVE = Configurations.getBooleanProperty("selFromHive", true); public static final boolean ONLY_SEL_FROM_HIVE = Configurations.getBooleanProperty("onlySelFromHive", true); /** @@ -385,12 +347,6 @@ public final class Constants { */ public static final String SEARCH_DATEFORMAT = Configurations.getStringProperty("search.dateformat", "yyyy-MM-dd HH:mm:ss"); - public static final String SEARCH_ES_HOSTANDPORT_A = Configurations.getStringProperty("search.eshostandport_A", - null); - public static final String SEARCH_ES_HOSTANDPORT_B = Configurations.getStringProperty("search.eshostandport_B", - null); - public static final String SEARCH_ES_HOSTANDPORT_C = Configurations.getStringProperty("search.eshostandport_C", - null); /** * 数据中心A版数据库名称,程序中每次查询时使用的数据库名称 use HIVEADBNAME */ diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 6174c71e5..98d4b740e 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -9,9 +9,6 @@ page.pageSize=20 #\u5206\u9875\u914d\u7f6e page.count=0 -#\u7d22\u5f15\u9875\u8def\u5f84 -web.view.index=/nis/index - #\u7f13\u5b58\u8bbe\u7f6e ehcache.configFile=cache/ehcache-local.xml #ehcache.configFile=cache/ehcache-rmi.xml @@ -60,71 +57,12 @@ version=V1.0.0 #\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d userfiles.basedir=upload - -#============================# -#===== webservice settings ======# -#============================# - -#ESB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u1e69\ufffd\ufffd\u0373\u04bb\ufffd\ufffd\u05b7 -webservice.esb.endpoint=http://10.55.0.197:7879/TongServiceProxy_doprocess/services/WebService1/ -#webservice RID -webservice.rid=XFBL - -#webservice user SID -webservice.yh.sid=s_2016_x2000 - -#webservice office SID -webservice.jg.sid=s_2015_x2000 - -#webservice data dict SID -webservice.data.dict.sid=s_2031_x2000 - -#webservice data dict bm SID -webservice.data.dict.bm.sid=s_2032_x2000 - -#webservice data dict code SID -webservice.data.dict.code.sid=s_2042_0660BD17-35E4-4482-AA3A-556F2C024902 - -#webservice request timeout for seconds -webservice.request.timeout=30 - -#\ufffd\ufffd\ufffd\ufffd\ufffdURL -webservice.jg.service.url=http://10.55.0.155:8080/jgService - -#\ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffdURL -webservice.yh.service.url=http://10.55.0.155:8080/ryService - -#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffdURL -webservice.data.dict.service.url=http://10.55.0.155:8080/sjzdService - -#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffd\ufffd\ufffd\ufffdURL -webservice.data.dict.bm.url=http://10.55.0.155:8080/sjzdbmService - -#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdURL -webservice.data.code.url=http://10.55.0.155:8080/sjmbService - -#webservice\ufffd\u04ff\ufffd\ufffd\ufffd\ufffd\u00ff\u04b3\ufffd\ufffd\ufffd\ufffd -webservice.data.pagesize = 2000 -#webservice\ufffd\ufffd\u01f0\u012c\ufffd\ufffd\u04b3 -webservice.data.currentpage = 1 - -#webservice \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd -webservice.jgmb.name=CK_T_JC_RY -#webservice \ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd -webservice.yhmb.name=CK_T_YH_RY -#webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \u022b\ufffd\ufffd -webservice.method.name.ql=getData -# webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd -webservice.method.name.zl=getDataZL - # redis\u914d\u7f6e\u6587\u4ef6 #redis \u5404\u4e2a\u5206\u7247\u7684 IP\u7aef\u53e3 redis.cluster.host_port=10.0.6.32:6379,10.0.6.32:6380,10.0.6.32:6381,10.0.6.33:6379,10.0.6.33:6380,10.0.6.33:6381 #\u4e2d\u5fc3\u73b0\u573aredis\u5730\u5740\u548c\u7aef\u53e3 -#redis.cluster.host_port=10.174.196.33:6379,10.174.196.33:6380,10.174.196.33:6381,10.174.196.34:6379,10.174.196.34:6380,10.174.196.34:6381,10.174.196.35:6379,10.174.196.35:6380,10.174.196.35:6381,10.174.196.36:6379,10.174.196.36:6380,10.174.196.36:6381,10.174.196.37:6379,10.174.196.37:6380,10.174.196.37:6381,10.174.196.38:6379,10.174.196.38:6380,10.174.196.38:6381,10.174.196.39:6379,10.174.196.39:6380,10.174.196.39:6381 - redis.cluster.connectiontimeout=5000 redis.cluster.sotimeout=5000 redis.cluster.maxattempts=3 @@ -169,54 +107,12 @@ http.pool.maxTotal=200 http.pool.defaultMaxPerRoute=100 ##########HTTPCLIENT POOL END################### search.dateformat=yyyy-MM-dd HH:mm:ss -search.eshostandport_A=10.0.6.115:9200 -search.eshostandport_B=10.0.6.115:9200 -search.eshostandport_C=10.0.6.115:9200 - -#search.eshostandport=10.174.196.135:9200 - - -#\u65e5\u5fd7\u662f\u5426\u4ecehive\u4e2d\u67e5\u8be2 -selFromHive=false - -#\u662f\u5426\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2\u8bb0\u5f55\u7684\u603b\u6761\u6570 -isGetHiveCount=false - #\u6bcf\u6b21\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u591a\u5c11\u6761\u6570\u636e,\u54b1\u4eec\u5728\u5bf9\u83b7\u53d6\u7684\u6570\u636e\u8fdb\u884c\u5206\u9875\u5904\u7406 everyGetHiveDataNum=10000 -#oracle\u6570\u636e\u5e93\u6709\u95ee\u9898\u4e0d\u4eceoracle\u67e5\u8be2\u6570\u636e,\u6240\u6709\u65e5\u5fd7\u6570\u636e\u5747\u4ece\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2 -onlySelFromHive=false - -#\u662f\u5426\u67e5\u8be2\u795e\u901a\u6570\u636e\u5e93 -isSelectCluster=true - #\u7528\u6237\u67e5\u8be2\u65e5\u5fd7\u8d85\u8fc7\u591a\u5c11\u5c0f\u65f6\u53bb\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2 dataCenterTime=48 -#\u662f\u5426\u5f00\u542f\u57fa\u7840\u9a8c\u8bc1 -baseValidate=true - -#\u662f\u5426\u5f00\u542f\u4e1a\u52a1\u9a8c\u8bc1 -serviceValidate=true - - - -#\u65e5\u5fd7\u5b58\u50a8\u672c\u5730\u65f6\u95f4(\u5355\u4f4d\u5c0f\u65f6) -logLocalTime=48 -#\u5b9e\u65f6\u7edf\u8ba1\u9ed8\u8ba4\u67e5\u8be2\u672c\u5730\u4e00\u4e2a\u5c0f\u65f6\u7684\u6570\u636e(\u5355\u4f4d\uff1a\u5c0f\u65f6) -reportLocalTime=1 - -#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u65e5\u5fd7\u65f6\u95f4(A\u7248\u6beb\u79d2) -#2017-08-13 10:07:25 -clusterAStartTime=1503504000725 -#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u7ed3\u675f\u65f6\u95f4(B\u7248\u6beb\u79d2) -#2017-08-13 10:07:25 -clusterBStartTime=1503504000725 -############################################################################################################################################ -#\u8bbe\u7f6e\u914d\u7f6e\u662f\u5426\u5165\u5e93 -############################################################################################################################################ -isCommit=true ############################################################################################################################################ ############################################################################################################################################ httpUrl=http://10.0.7.14:9999/galaxy-service/service/cfg/