Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
Conflicts: projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy
This commit is contained in:
@@ -17,16 +17,30 @@ fangjia.auto.url=${fangjia.auto.host}:${fangjia.auto.port}/
|
||||
fangjia.file.mongo.host=fs.mongo.db.fangjia.com
|
||||
fangjia.file.mongo.port=27017
|
||||
|
||||
#fangjia.log.mongo.host=log.mongo.db.fangjia.com
|
||||
#fangjia.log.mongo.port=27017
|
||||
|
||||
fangjia.log.mongo.host=log.mongo.db.fangjia.com
|
||||
fangjia.log.mongo.port=27017
|
||||
fangjia.log.mongo.port=52002
|
||||
fangjia.log.mongodb.mongoUri=mongodb://${fangjia.log.mongo.host}:${fangjia.log.mongo.port}/
|
||||
|
||||
fangjia.mongo.host=mongo.db.fangjia.com
|
||||
fangjia.mongo.port=27017
|
||||
fangjia.mongodb.mongoUri=mongodb://${fangjia.mongo.host}:${fangjia.mongo.port},${fangjia.secondary.mongo.host}:${fangjia.secondary.mongo.port}/
|
||||
|
||||
|
||||
fangjia.fs.mongo.host=fs.mongo.db.fangjia.com
|
||||
fangjia.fs.mongo.port=27017
|
||||
fangjia.fs.mongodb.mongoUri=mongodb://${fangjia.fs.mongo.host}:${fangjia.fs.mongo.port}/
|
||||
|
||||
fangjia.seabird.mongodb.mongoUri=mongodb://developer:G00IDCDEV12385@${fangjia.mongo.host}:${fangjia.mongo.port},${fangjia.secondary.mongo.host}:${fangjia.secondary.mongo.port}/
|
||||
|
||||
|
||||
fangjia.knowbase.host=knowbase.db.fangjia.com
|
||||
fangjia.knowbase.port=7180
|
||||
fangjia.knowbase.url=${fangjia.knowbase.host}:${fangjia.knowbase.port}/
|
||||
|
||||
|
||||
fangjia.environment=development
|
||||
#fangjia.environment=production
|
||||
|
||||
|
||||
@@ -25,12 +25,12 @@
|
||||
</filter-class>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<filter-name>AccessLogFilter</filter-name>
|
||||
<filter-class>
|
||||
com.fangjia.geluke.filters.AccessLogFilter
|
||||
</filter-class>
|
||||
</filter>
|
||||
<!-- <filter>-->
|
||||
<!-- <filter-name>AccessLogFilter</filter-name>-->
|
||||
<!-- <filter-class>-->
|
||||
<!-- com.fangjia.geluke.filters.AccessLogFilter-->
|
||||
<!-- </filter-class>-->
|
||||
<!-- </filter>-->
|
||||
|
||||
<filter>
|
||||
<filter-name>SpiderValidateFilter</filter-name>
|
||||
@@ -47,20 +47,20 @@
|
||||
</init-param>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<filter-name>AnalyticsFilter</filter-name>
|
||||
<filter-class>
|
||||
org.springframework.web.filter.DelegatingFilterProxy
|
||||
</filter-class>
|
||||
<init-param>
|
||||
<param-name>targetBeanName</param-name>
|
||||
<param-value>analyticsFilter</param-value>
|
||||
</init-param>
|
||||
<init-param>
|
||||
<param-name>targetFilterLifecycle</param-name>
|
||||
<param-value>true</param-value>
|
||||
</init-param>
|
||||
</filter>
|
||||
<!-- <filter>-->
|
||||
<!-- <filter-name>AnalyticsFilter</filter-name>-->
|
||||
<!-- <filter-class>-->
|
||||
<!-- org.springframework.web.filter.DelegatingFilterProxy-->
|
||||
<!-- </filter-class>-->
|
||||
<!-- <init-param>-->
|
||||
<!-- <param-name>targetBeanName</param-name>-->
|
||||
<!-- <param-value>analyticsFilter</param-value>-->
|
||||
<!-- </init-param>-->
|
||||
<!-- <init-param>-->
|
||||
<!-- <param-name>targetFilterLifecycle</param-name>-->
|
||||
<!-- <param-value>true</param-value>-->
|
||||
<!-- </init-param>-->
|
||||
<!-- </filter>-->
|
||||
|
||||
<filter>
|
||||
<filter-name>sothis</filter-name>
|
||||
@@ -80,21 +80,21 @@
|
||||
<url-pattern>/*</url-pattern>
|
||||
<dispatcher>REQUEST</dispatcher>
|
||||
</filter-mapping>
|
||||
<filter-mapping>
|
||||
<filter-name>AccessLogFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
<dispatcher>REQUEST</dispatcher>
|
||||
</filter-mapping>
|
||||
<!-- <filter-mapping>-->
|
||||
<!-- <filter-name>AccessLogFilter</filter-name>-->
|
||||
<!-- <url-pattern>/*</url-pattern>-->
|
||||
<!-- <dispatcher>REQUEST</dispatcher>-->
|
||||
<!-- </filter-mapping>-->
|
||||
<filter-mapping>
|
||||
<filter-name>SpiderValidateFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
<dispatcher>REQUEST</dispatcher>
|
||||
</filter-mapping>
|
||||
<filter-mapping>
|
||||
<filter-name>AnalyticsFilter</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
<dispatcher>REQUEST</dispatcher>
|
||||
</filter-mapping>
|
||||
<!-- <filter-mapping>-->
|
||||
<!-- <filter-name>AnalyticsFilter</filter-name>-->
|
||||
<!-- <url-pattern>/*</url-pattern>-->
|
||||
<!-- <dispatcher>REQUEST</dispatcher>-->
|
||||
<!-- </filter-mapping>-->
|
||||
<filter-mapping>
|
||||
<filter-name>sothis</filter-name>
|
||||
<url-pattern>/*</url-pattern>
|
||||
|
||||
Reference in New Issue
Block a user