summaryrefslogtreecommitdiff
path: root/ip-learning-java-test/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'ip-learning-java-test/src/main/resources')
-rw-r--r--ip-learning-java-test/src/main/resources/application.properties6
-rw-r--r--ip-learning-java-test/src/main/resources/clickhouse.properties3
-rw-r--r--ip-learning-java-test/src/main/resources/log4j.properties24
3 files changed, 29 insertions, 4 deletions
diff --git a/ip-learning-java-test/src/main/resources/application.properties b/ip-learning-java-test/src/main/resources/application.properties
index 1b22db2..96c5b3b 100644
--- a/ip-learning-java-test/src/main/resources/application.properties
+++ b/ip-learning-java-test/src/main/resources/application.properties
@@ -1,5 +1,5 @@
#arangoDB参数配置
-arangoDB.host=192.168.40.182
+arangoDB.host=192.168.40.127
arangoDB.port=8529
arangoDB.user=root
arangoDB.password=111111
@@ -12,5 +12,5 @@ update.arango.batch=10000
thread.pool.number=5
thread.await.termination.time=10
-read.clickhouse.max.time=1571241660
-read.clickhouse.min.time=1571241600 \ No newline at end of file
+read.clickhouse.max.time=1594809098
+read.clickhouse.min.time=1593792000 \ No newline at end of file
diff --git a/ip-learning-java-test/src/main/resources/clickhouse.properties b/ip-learning-java-test/src/main/resources/clickhouse.properties
index c5d89ac..00ebd01 100644
--- a/ip-learning-java-test/src/main/resources/clickhouse.properties
+++ b/ip-learning-java-test/src/main/resources/clickhouse.properties
@@ -1,5 +1,6 @@
drivers=ru.yandex.clickhouse.ClickHouseDriver
-db.id=192.168.40.193:8123/av_miner?socket_timeout=300000
+#db.id=192.168.40.193:8123/av_miner?socket_timeout=300000
+db.id=192.168.40.186:8123/tsg_galaxy_v3?socket_timeout=300000
mdb.user=default
mdb.password=111111
initialsize=1
diff --git a/ip-learning-java-test/src/main/resources/log4j.properties b/ip-learning-java-test/src/main/resources/log4j.properties
new file mode 100644
index 0000000..21cea3d
--- /dev/null
+++ b/ip-learning-java-test/src/main/resources/log4j.properties
@@ -0,0 +1,24 @@
+######################### logger ##############################
+log4j.logger.org.apache.http=OFF
+log4j.logger.org.apache.http.wire=OFF
+
+#Log4j
+log4j.rootLogger=info,console,file
+# ����̨��־����
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Threshold=info
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] [%-5p] [Thread\:%t] %l %x - <%m>%n
+
+# �ļ���־����
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.Threshold=info
+log4j.appender.file.encoding=UTF-8
+log4j.appender.file.Append=true
+#·���������·����������ز��������Ӧ��Ŀ��
+#log4j.appender.file.file=/home/ceiec/iplearning/logs/ip-learning-application.log
+log4j.appender.file.file=./logs/ip-learning-application.log
+log4j.appender.file.DatePattern='.'yyyy-MM-dd
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss} %X{ip} [%t] %5p %c{1} %m%n
+log4j.appender.file.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] [%-5p] %X{ip} [Thread\:%t] %l %x - %m%n