按环境隔离配置

search-console/src/main/resources/dev/dubbo.properties

@@ -0,0 +1,2 @@
+dubbo.owner=test
+dubbo.group=test

search-console/src/main/resources/dev/jdbc.properties

@@ -0,0 +1,12 @@
+#test model
+jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+jdbc.username=uuplatformdemo
+jdbc.password=selectuuplatform
+jdbc.initialSize=10
+jdbc.maxActive=100
+jdbc.maxIdle=50
+jdbc.minIdle=50
+jdbc.suspectTimeout=60
+jdbc.timeBetweenEvictionRunsMillis=30000
+jdbc.minEvictableIdleTimeMillis=60000

search-console/src/main/resources/jdbc.properties

@@ -1,24 +0,0 @@
-#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-#jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
-#jdbc.username=uuplatformdemo
-#jdbc.password=selectuuplatform
-#jdbc.initialSize=10
-#jdbc.maxActive=100
-#jdbc.maxIdle=50
-#jdbc.minIdle=50
-#jdbc.suspectTimeout=60
-#jdbc.timeBetweenEvictionRunsMillis=30000
-#jdbc.minEvictableIdleTimeMillis=60000
-
-#product mode
-jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
-jdbc.username=platform$b2b
-jdbc.password=select*fromuu
-jdbc.initialSize=10
-jdbc.maxActive=100
-jdbc.maxIdle=50
-jdbc.minIdle=50
-jdbc.suspectTimeout=60
-jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000

search-console/src/main/resources/prod/dubbo.properties

@@ -0,0 +1,2 @@
+dubbo.owner=prod
+dubbo.group=prod

search-console/src/main/resources/prod/jdbc.properties

@@ -0,0 +1,12 @@
+#product mode
+jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
+jdbc.username=platform$b2b
+jdbc.password=select*fromuu
+jdbc.initialSize=10
+jdbc.maxActive=100
+jdbc.maxIdle=50
+jdbc.minIdle=50
+jdbc.suspectTimeout=60
+jdbc.timeBetweenEvictionRunsMillis=30000
+jdbc.minEvictableIdleTimeMillis=60000

search-console/src/main/resources/prod/logging.properties

@@ -0,0 +1,15 @@
+#Tomcat Logger
+
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler   
+  
+############################################################   
+# Handler specific properties.   
+# Describes specific configuration info for Handlers.   
+############################################################   
+  
+org.apache.juli.FileHandler.level = FINE   
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs   
+org.apache.juli.FileHandler.prefix = error-debug.   
+  
+java.util.logging.ConsoleHandler.level = FINE   
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

search-console/src/main/resources/applicationContext.xml → search-console/src/main/resources/spring/applicationContext.xml

@@ -12,7 +12,7 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.1.xsd">
 
-	<context:property-placeholder location="classpath*:*.properties" />
+	<context:property-placeholder location="classpath*:${profile}/*.properties" />
 	<!-- 注册spring上下文对象 -->
 	<bean class="com.uas.search.console.support.ApplicationContextRegister" />
 
@@ -114,7 +114,7 @@
 	</bean>
 	<bean id="ehcache"
 		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-		<property name="configLocation" value="classpath:ehcache.xml"></property>
+		<property name="configLocation" value="classpath:spring/ehcache.xml"></property>
 		<property name="shared" value="true"></property>
 	</bean>
 	

search-console/src/main/resources/provider.xml → search-console/src/main/resources/spring/provider.xml

@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 	
-	<dubbo:application name="search_provider" />
+	<dubbo:application name="search_provider" owner="${dubbo.owner}" />
 	
 	<dubbo:registry address="zookeeper://10.10.100.11:2181" />
 	
@@ -12,6 +12,6 @@
 	
 	<bean id="searchService" class="com.uas.search.console.service.impl.SearchServiceImpl" />
 	
-	<dubbo:service interface="com.uas.search.service.SearchService" ref="searchService" />
+	<dubbo:service interface="com.uas.search.service.SearchService" ref="searchService" group="${dubbo.group}" />
 	
 </beans>

search-console/src/main/resources/test/dubbo.properties

@@ -0,0 +1,2 @@
+dubbo.owner=test
+dubbo.group=test

search-console/src/main/resources/test/jdbc.properties

@@ -0,0 +1,12 @@
+#test model
+jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+jdbc.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+jdbc.username=uuplatformdemo
+jdbc.password=selectuuplatform
+jdbc.initialSize=10
+jdbc.maxActive=100
+jdbc.maxIdle=50
+jdbc.minIdle=50
+jdbc.suspectTimeout=60
+jdbc.timeBetweenEvictionRunsMillis=30000
+jdbc.minEvictableIdleTimeMillis=60000

search-console/src/main/resources/test/logging.properties

@@ -0,0 +1,15 @@
+#Tomcat Logger
+
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler   
+  
+############################################################   
+# Handler specific properties.   
+# Describes specific configuration info for Handlers.   
+############################################################   
+  
+org.apache.juli.FileHandler.level = FINE   
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs   
+org.apache.juli.FileHandler.prefix = error-debug.   
+  
+java.util.logging.ConsoleHandler.level = FINE   
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter