From 8513f91c3f55c43e22f1467ec4bea2d382bb34f4 Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 3 Sep 2024 09:37:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2006mongo=E5=8A=A0=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia-core/src/main/java/com/fangjia/core/Constants.java | 2 +- .../com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy | 3 ++- .../com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java b/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java index 7a9f45104..2cc2c080c 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java @@ -7,7 +7,7 @@ public interface Constants { String FANGJIA_CRAWL_MONGO_URI = "mongodb://192.168.0.235:27018"; String LOG_MONGO_URI = "mongodb://192.168.0.42:52002"; String SEABIRD_MONGO_URI = "mongodb://192.168.0.74:57007"; - String SEAWATER_MONGO_URI = "mongodb://192.168.0.206:27020"; + String SEAWATER_MONGO_URI = "mongodb://root:Goojia%40206!!#@192.168.0.206:27020"; String MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH ="http://192.168.0.100:38080/FangJiaDataService"; } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy index b1ed3a554..d0c89f4fc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/hubingliang/ApiInvokeStatistics.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.hubingliang +import com.fangjia.core.Constants import com.fangjia.core.util.DateUtil import groovy.sql.Sql @@ -23,7 +24,7 @@ import com.mongodb.DBObject @BatchOwner(Watcher.Hubingliang) class ApiInvokeStatistics extends BaseBatch{ final static def mongoDomain = "mongo.db.fangjia.com" - public static final DBCollection OPEN_URI_LOG = MongoUtils.getCollectionByName("business", "open_uri_log", "seawater.mongo.db.fangjia.com", 27020) + public static final DBCollection OPEN_URI_LOG = com.fangjia.core.util.MongoUtils.getDbCollection(Constants.SEAWATER_MONGO_URI,"business", "open_uri_log") public static final DBCollection OPEN_URI_LOG_COUNT = MongoUtils.getCollectionByName("business", "api_invoke_statistical", "mongo.db.fangjia.com", 27017) static final dbFangjia = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia?autoReconnect=true&characterEncoding=utf-8&autoReconnect=true", "sa", "G00jia", "com.mysql.jdbc.Driver"); static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy index cd92b6635..135c1b920 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.openApi +import com.fangjia.core.Constants import groovy.sql.Sql; import java.util.regex.Matcher import java.util.regex.Pattern @@ -24,7 +25,7 @@ import com.fangjia.script.Watcher class OpenApiLogAnalyBatch extends BaseBatch{ - static DBCollection OPEN_URI_LOG_COLL = MongoUtils.getCollectionByName("business", "open_uri_log", "seawater.mongo.db.fangjia.com",27020); + static DBCollection OPEN_URI_LOG_COLL = com.fangjia.core.util.MongoUtils.getDbCollection(Constants.SEAWATER_MONGO_URI,"business", "open_uri_log") static DBCollection OPEN_URI_ANALY_COLL = MongoUtils.getCollectionByName("business", "open_uri_analy", "mongo.db.fangjia.com"); final Sql USER_CONN = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia?useUnicode=true&characterEncoding=utf-8&autoReconnect=true", "sa", "G00jia", "com.mysql.jdbc.Driver") From d09c645d4118a890919a66f41f011b2f3ce4a5a8 Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 3 Sep 2024 10:19:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2006mongo=E5=90=8C=E6=AD=A5ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy index a634ea6dc..9979ef73c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy @@ -16,6 +16,7 @@ import org.apache.commons.lang.StringUtils import org.elasticsearch.action.bulk.BulkProcessor import org.elasticsearch.action.index.IndexRequest import java.util.concurrent.TimeUnit +import com.fangjia.core.Constants /** * ¹¦ÄÜ˵Ã÷: @@ -24,7 +25,7 @@ import java.util.concurrent.TimeUnit class AnalysisOpenUriLogSyncBatch extends BaseBatch { - DBCollection OPEN_URI_LOG_COLL = MongoUtils.getCollectionByName("business", "open_uri_log", "192.168.0.206",27020) + DBCollection OPEN_URI_LOG_COLL = com.fangjia.core.util.MongoUtils.getDbCollection(Constants.SEAWATER_MONGO_URI,"business", "open_uri_log") static final def SQL = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/goojia_fangjia?&characterEncoding=utf8", "sa", "G00jia", "com.mysql.jdbc.Driver"); @@ -53,7 +54,7 @@ class AnalysisOpenUriLogSyncBatch extends BaseBatch { void process(Object args) { Map userInfo = getUserInfo() - def startDate = DateUtil.truncateDay(DateUtil.add(new Date(), -3)) + def startDate = DateUtil.truncateDay(DateUtil.add(new Date(), -30)) def endDate = DateUtil.truncateDay(new Date()) BasicDBObject query = new BasicDBObject() query.append("c_date", new BasicDBObject('$gte', startDate).append('$lt', endDate))