Browse Source

remove spring cloud config;
add default profile 'all' in pom.xml

sunyj 8 years ago
parent
commit
3affbf17fa

+ 10 - 14
pom.xml

@@ -17,29 +17,31 @@
 
 
 	<profiles>
 	<profiles>
 		<profile>
 		<profile>
-			<id>b2c_release</id>
+			<id>all</id>
 			<activation>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			</activation>
 			<modules>
 			<modules>
-				<!-- api -->
 				<module>search-api</module>
 				<module>search-api</module>
-				<!-- console -->
+				<module>search-console</module>
+				<module>search-api-b2b</module>
+				<module>search-console-b2b</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>b2c_release</id>
+			<modules>
+				<module>search-api</module>
 				<module>search-console</module>
 				<module>search-console</module>
 			</modules>
 			</modules>
 		</profile>
 		</profile>
 		<profile>
 		<profile>
 			<id>b2b_release</id>
 			<id>b2b_release</id>
 			<modules>
 			<modules>
-				<!-- api -->
 				<module>search-api-b2b</module>
 				<module>search-api-b2b</module>
-				<!-- console -->
 				<module>search-console-b2b</module>
 				<module>search-console-b2b</module>
 			</modules>
 			</modules>
 		</profile>
 		</profile>
-		<profile>
-			<id>release</id>
-		</profile>
 	</profiles>
 	</profiles>
 
 
 	<properties>
 	<properties>
@@ -48,7 +50,6 @@
 		<java.source.version>1.7</java.source.version>
 		<java.source.version>1.7</java.source.version>
 		<java.target.version>1.7</java.target.version>
 		<java.target.version>1.7</java.target.version>
 		<maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
 		<maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
-		<spring.cloud.version>1.2.1.RELEASE</spring.cloud.version>
 		<dubbo.version>2.8.4</dubbo.version>
 		<dubbo.version>2.8.4</dubbo.version>
 		<zookeeper.version>3.4.6</zookeeper.version>
 		<zookeeper.version>3.4.6</zookeeper.version>
 		<servlet.version>3.0-alpha-1</servlet.version>
 		<servlet.version>3.0-alpha-1</servlet.version>
@@ -62,11 +63,6 @@
 
 
 	<dependencyManagement>
 	<dependencyManagement>
 		<dependencies>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-config</artifactId>
-				<version>${spring.cloud.version}</version>
-			</dependency>
 			<dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<groupId>javax.servlet</groupId>
 				<artifactId>servlet-api</artifactId>
 				<artifactId>servlet-api</artifactId>

+ 0 - 4
search-console-b2b/pom.xml

@@ -18,10 +18,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
-		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 			<artifactId>spring-boot-starter-web</artifactId>

+ 30 - 36
search-console-b2b/src/main/resources/bootstrap.yml → search-console-b2b/src/main/resources/application.yml

@@ -1,36 +1,30 @@
-spring:
- application:
-  name: b2b-search
- cloud:
-  config:
-   uri: http://10.10.100.145:8080
- jpa:
-  database: ORACLE
-  show-sql: false
-  properties:
-   hibernate:
-    dialect: org.hibernate.dialect.Oracle10gDialect
- http:
-  multipart:
-   enabled: true
-   max-file-size: 512MB
-   max-request-size: 512MB
-     
-
-security:
- user:
-  name: admin
-  password: select111***
-  role: ADMIN
- ignored:
-  - /static/**
-  
-schedule:
- daily:
-  time:
-   hour: 3
-   minute: 0
-   second: 0
-   
-zk:
- url: zookeeper://10.10.100.11:2181
+spring:
+ jpa:
+  database: ORACLE
+  show-sql: false
+  properties:
+   hibernate:
+    dialect: org.hibernate.dialect.Oracle10gDialect
+ http:
+  multipart:
+   enabled: true
+   max-file-size: 512MB
+   max-request-size: 512MB
+     
+security:
+ user:
+  name: admin
+  password: select111***
+  role: ADMIN
+ ignored:
+  - /static/**
+  
+schedule:
+ daily:
+  time:
+   hour: 3
+   minute: 0
+   second: 0
+   
+zk:
+ url: zookeeper://10.10.100.11:2181

+ 32 - 0
search-console-b2b/src/main/resources/config/application-dev.properties

@@ -0,0 +1,32 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+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=true;druid.stat.slowSqlMillis=5000
+
+#platformmanager
+platformmanager.datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+platformmanager.datasource.username=platformmanager$test
+platformmanager.datasource.password=select!#%*(
+
+dubbo.owner=dev
+dubbo.group=dev
+
+lucene.indexes.dir=/mnt/data/b2b-search/dev/indexes
+lucene.data.dir=/mnt/data/b2b-search/dev/data
+
+schedule.auto-start=false

+ 32 - 0
search-console-b2b/src/main/resources/config/application-prod.properties

@@ -0,0 +1,32 @@
+datasource.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
+datasource.username=platform$b2b
+datasource.password=select*fromuu
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+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=true;druid.stat.slowSqlMillis=5000
+
+#platformmanager
+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

+ 32 - 0
search-console-b2b/src/main/resources/config/application-test.properties

@@ -0,0 +1,32 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+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=true;druid.stat.slowSqlMillis=5000
+
+#platformmanager
+platformmanager.datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+platformmanager.datasource.username=platformmanager$test
+platformmanager.datasource.password=select!#%*(
+
+dubbo.owner=test
+dubbo.group=test
+
+lucene.indexes.dir=/mnt/data/b2b-search/test/indexes
+lucene.data.dir=/mnt/data/b2b-search/test/data
+
+schedule.auto-start=true

+ 0 - 4
search-console/pom.xml

@@ -18,10 +18,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
-		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 			<artifactId>spring-boot-starter-web</artifactId>

+ 27 - 32
search-console/src/main/resources/bootstrap.yml → search-console/src/main/resources/application.yml

@@ -1,32 +1,27 @@
-spring:
- application:
-  name: mall-search
- cloud:
-  config:
-   uri: http://10.10.100.145:8080
- jpa:
-  database: ORACLE
-  show-sql: false
-  properties:
-   hibernate:
-    dialect: org.hibernate.dialect.Oracle10gDialect
- http:
-  multipart:
-   enabled: true
-   max-file-size: 512MB
-   max-request-size: 512MB
-     
-
-security:
- user:
-  name: admin
-  password: select111***
-  role: ADMIN
- ignored:
-  - /static/**
-  
-schedule:
- auto-start: true
-   
-zk:
- url: zookeeper://10.10.100.11:2181
+spring:
+ jpa:
+  database: ORACLE
+  show-sql: false
+  properties:
+   hibernate:
+    dialect: org.hibernate.dialect.Oracle10gDialect
+ http:
+  multipart:
+   enabled: true
+   max-file-size: 512MB
+   max-request-size: 512MB
+     
+
+security:
+ user:
+  name: admin
+  password: select111***
+  role: ADMIN
+ ignored:
+  - /static/**
+  
+schedule:
+ auto-start: true
+   
+zk:
+ url: zookeeper://10.10.100.11:2181

+ 25 - 0
search-console/src/main/resources/config/application-dev.properties

@@ -0,0 +1,25 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+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=true;druid.stat.slowSqlMillis=5000
+
+dubbo.owner=dev
+dubbo.group=dev
+
+lucene.indexes.dir=/mnt/data/mall-search/dev/indexes
+lucene.data.dir=/mnt/data/mall-search/dev/data

+ 25 - 0
search-console/src/main/resources/config/application-prod.properties

@@ -0,0 +1,25 @@
+datasource.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
+datasource.username=platform$b2b
+datasource.password=select*fromuu
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+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=true;druid.stat.slowSqlMillis=5000
+
+dubbo.owner=prod
+dubbo.group=prod
+
+lucene.indexes.dir=/data/indexes
+lucene.data.dir=/data/data

+ 25 - 0
search-console/src/main/resources/config/application-test.properties

@@ -0,0 +1,25 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+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=true;druid.stat.slowSqlMillis=5000
+
+dubbo.owner=test
+dubbo.group=test
+
+lucene.indexes.dir=/mnt/data/mall-search/test/indexes
+lucene.data.dir=/mnt/data/mall-search/test/data