Merge remote-tracking branch 'origin/dev' into feature-180808-wangyc

mall-search/src/main/resources/config/application-txcloud.properties

@@ -0,0 +1,24 @@
+datasource.url=jdbc:mysql://10.10.0.208:3306/mall_prod?characterEncoding=utf-8&useSSL=false
+datasource.username=sa
+datasource.password=Select123!#%*(
+datasource.driverClassName=com.mysql.jdbc.Driver
+datasource.initialSize=1
+datasource.minIdle=1
+datasource.maxActive=100
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=300000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+lucene.indexes.dir=/usr/local/mall-search/data/indexes
+lucene.data.dir=/usr/local/mall-search/data/data
+
+security.basic.path=/console

search-console-b2b/src/main/resources/config/application-cloud.properties

@@ -0,0 +1,33 @@
+datasource.driverClassName=com.mysql.jdbc.Driver
+datasource.url=jdbc:mysql://10.10.100.18:3306/b2b_prod?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
+datasource.username=root
+datasource.password=select
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+#platformmanager
+platformmanager.datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+platformmanager.datasource.url=jdbc:oracle:thin:@//10.10.100.215:1521/orcl
+platformmanager.datasource.username=platformmanager
+platformmanager.datasource.password=select!#%*(
+
+dubbo.owner=prod
+dubbo.group=prod
+
+lucene.indexes.dir=/mnt/data/b2b-search/prod/indexes
+lucene.data.dir=/mnt/data/b2b-search/prod/data
+
+schedule.auto-start=true