From 07e37b22f06b0ca07cdd0f01472b197a889d61f3 Mon Sep 17 00:00:00 2001 From: carrieyzzhang <carrie_yz@163.com> Date: Wed, 21 Mar 2018 10:19:18 +0800 Subject: [PATCH] aws online pom config --- pom.xml | 45 +++++++++++++++++++-------------------------- src/main/java/com/reyun/util/Constant.java | 5 ----- src/main/java/com/reyun/util/RedisUtilNew.java | 11 +++++++++-- src/main/resources/common.properties | 7 +------ src/main/resources/redis.properties | 1 + 5 files changed, 30 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index f334b9e..563e38f 100644 --- a/pom.xml +++ b/pom.xml @@ -198,9 +198,9 @@ <id>aws</id> <properties> <label>product</label> - <datasource.url>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/trackingio?characterEncoding=utf-8</datasource.url> - <datasource.username>trackingio</datasource.username> - <datasource.password>trackingio</datasource.password> + <datasource.url>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8</datasource.url> + <datasource.username>reyun</datasource.username> + <datasource.password>Reyun123</datasource.password> <datasource.driver>com.mysql.jdbc.Driver</datasource.driver> @@ -211,6 +211,7 @@ <redis.surl.host>trackingioweb.nr7fi4.ng.0001.cnn1.cache.amazonaws.com.cn</redis.surl.host> <redis.surl.port>6379</redis.surl.port> + <redis.surl.database>1</redis.surl.database> <redis.event.host>trackingio-web.nr7fi4.0001.cnn1.cache.amazonaws.com.cn</redis.event.host> <redis.event.port>6379</redis.event.port> @@ -218,17 +219,16 @@ <!--Redis setting//end--> - <awsneed>true</awsneed> + <awsneed>false</awsneed> <mail.host>smtp.exmail.qq.com</mail.host> - <mail.username>service1@reyun.com</mail.username> - <mail.password>XSW29ijn</mail.password> + <mail.username>service4@reyun.com</mail.username> + <mail.password>3xy9cUFpe4VdPuoH</mail.password> <mail.content_type>text/plain;charset\=GBK</mail.content_type> - <mail.list>zhangliang@reyun.com</mail.list> + <mail.list>zhangxiaoyan@reyun.com</mail.list> <mail.valid_time>4320</mail.valid_time> - <track.url>http://uri6.com/tkio</track.url> <report.url>http://internal-report-api-976419027.cn-north-1.elb.amazonaws.com.cn</report.url> <admin.url>http://ec2-54-223-136-157.cn-north-1.compute.amazonaws.com.cn:8099</admin.url> @@ -239,30 +239,23 @@ <event.table>tkio_bigtable_view.event_</event.table> <usergroup.table>tkio_bigtable.tkio_user_group</usergroup.table> - <file.rootdir>https://s3.cn-north-1.amazonaws.com.cn/reyundownload/trackingio</file.rootdir> - <shenma.download.dir>/data/shenmadownload/</shenma.download.dir> - <report.export.task>ExportReportTask</report.export.task> - <app.debug.task>AutoSyncAppDebugStatus</app.debug.task> - <tkiostreamdatasource.url>jdbc:mysql://etl.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/tkio_stream?characterEncoding=utf-8</tkiostreamdatasource.url> - <tkiostreamdatasource.username>trackingio_rpt</tkiostreamdatasource.username> - <tkiostreamdatasource.password>trackingio_rpt</tkiostreamdatasource.password> - <tkiostreamdatasource.driver>com.mysql.jdbc.Driver</tkiostreamdatasource.driver> - <tkiostreamdatasource.minIdle>4</tkiostreamdatasource.minIdle> - <tkiostreamdatasource.maxIdle>8</tkiostreamdatasource.maxIdle> - <tkiostreamdatasource.maxActive>10</tkiostreamdatasource.maxActive> - <tkiostreamdatasource.initialSize>5</tkiostreamdatasource.initialSize> - <tkiostreamdatasource.maxWait>5000</tkiostreamdatasource.maxWait> + <presto.driver>com.facebook.presto.jdbc.PrestoDriver</presto.driver> + <presto.url>jdbc:presto://172.31.11.248:18889/hive/default</presto.url> + <presto.username>presto</presto.username> + <presto.password></presto.password> + <presto.minconnection>100</presto.minconnection> + <presto.maxconnection>500</presto.maxconnection> + <presto.timeoutvalue>3600000</presto.timeoutvalue> - <tkio.url>http://www.trackingio.com/</tkio.url> + <hive.driver>org.apache.hive.jdbc.HiveDriver</hive.driver> + <hive.url>jdbc:hive2://172.31.11.248:10000/test</hive.url> + <hive.username>root</hive.username> <iscache>0</iscache> - <account.check.url>http://trackingio.com</account.check.url> + <account.check.url>http://io.reyun.com</account.check.url> - <messagecode.url>http://172.31.0.212:8890/message/sms/verifycode/send</messagecode.url> - <ddb.accesskey>AKIAPMJ4QRXP6BECFUVQ</ddb.accesskey> - <ddb.secretkey>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</ddb.secretkey> </properties> </profile> </profiles> diff --git a/src/main/java/com/reyun/util/Constant.java b/src/main/java/com/reyun/util/Constant.java index 96ee302..105df80 100644 --- a/src/main/java/com/reyun/util/Constant.java +++ b/src/main/java/com/reyun/util/Constant.java @@ -37,11 +37,6 @@ public class Constant { public static String iscache = commonBundle.getString("iscache"); public static String receiverHost = commonBundle.getString("receiver.host"); public static String receiverPort = commonBundle.getString("receiver.port"); - public static String reportExportTask = commonBundle.getString("report.export.task"); - public static String appDebugTask = commonBundle.getString("app.debug.task"); - public static String tkioUrl = commonBundle.getString("tkio.url"); - public static String awsAccessKey = commonBundle.getString("aws.accesskey"); - public static String awsSecretKey = commonBundle.getString("aws.secret"); diff --git a/src/main/java/com/reyun/util/RedisUtilNew.java b/src/main/java/com/reyun/util/RedisUtilNew.java index a846d4d..b094d0a 100644 --- a/src/main/java/com/reyun/util/RedisUtilNew.java +++ b/src/main/java/com/reyun/util/RedisUtilNew.java @@ -1,5 +1,6 @@ package com.reyun.util; +import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.Jedis; @@ -25,8 +26,14 @@ public class RedisUtilNew { private RedisUtilNew() { ResourceBundle resourceBundle = ResourceBundle.getBundle("redis"); - pool = new JedisPool(resourceBundle.getString("redis.surl.host"), - Integer.valueOf(resourceBundle.getString("redis.surl.port"))); + pool = new JedisPool( + new GenericObjectPoolConfig(), + resourceBundle.getString("redis.surl.host"), + Integer.valueOf(resourceBundle.getString("redis.surl.port")), + Integer.parseInt(Constant.REDIS_IP_REQUEST_TIMES), + null, + Integer.valueOf(resourceBundle.getString("redis.surl.database")), + null); } public static RedisUtilNew getInstance() { diff --git a/src/main/resources/common.properties b/src/main/resources/common.properties index bf3fb59..3ac1de0 100644 --- a/src/main/resources/common.properties +++ b/src/main/resources/common.properties @@ -8,9 +8,4 @@ receiver.port=${receiver.port} report.url=${report.url} awsneed=${awsneed} iscache=${iscache} -admin.url=${admin.url} -report.export.task=${report.export.task} -app.debug.task=${app.debug.task} -tkio.url=${tkio.url} -aws.accesskey=${aws.accesskey} -aws.secret=${aws.secret} \ No newline at end of file +admin.url=${admin.url} \ No newline at end of file diff --git a/src/main/resources/redis.properties b/src/main/resources/redis.properties index 9bb36e3..7e5a0a9 100644 --- a/src/main/resources/redis.properties +++ b/src/main/resources/redis.properties @@ -4,6 +4,7 @@ redis.ip.requesttimes=${redis.ip.requesttimes} # token redis.surl.host=${redis.surl.host} redis.surl.port=${redis.surl.port} +redis.surl.database=${redis.surl.database} # event redis.event.host=${redis.event.host} -- libgit2 0.27.1