使用gic配置方式

gic-cloud-data-hook-service/pom.xml

@@ -2,7 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+	<parent>
+		<groupId>com.gic</groupId>
+		<artifactId>gic-pom-base</artifactId>
+		<version>3.0-SNAPSHOT</version>
+	</parent>
 	<groupId>com.gic</groupId>
 	<modelVersion>4.0.0</modelVersion>
 	<name>${project.artifactId}</name>

gic-cloud-data-hook-service/src/main/resources/META-INF/app.properties

+app.id=data-hook
\ No newline at end of file

gic-cloud-data-hook-service/src/main/resources/applicationContext-conf.xml

@@ -23,10 +23,12 @@
     <!--<import resource="classpath:data-hook-free-query-source.xml"/>-->
     <import resource="classpath*:data-hook-service-druid-prod.xml"/>
     <import resource="classpath:data-hook-init.xml"/>
-    <import resource="file:config/data-hook-dubbo-settings.xml"/>
+    <import resource="classpath*:dubbo-setting.xml"/>
     <import resource="classpath:data-hook-service-dubbo-config.xml"/>
-    <import resource="file:config/data-hook-flat-query-source.xml"/>
-    <import resource="file:config/data-hook-free-query-source.xml"/>
+    <!--<import resource="file:config/data-hook-flat-query-source.xml"/>-->
+    <!--<import resource="file:config/data-hook-free-query-source.xml"/>-->
+    <import resource="classpath:data-hook-flat-query-source.xml"/>
+    <import resource="classpath:data-hook-free-query-source.xml"/>
     <!--<import resource="classpath:cloud-web-service-task.xml" />-->
 
 </beans>
\ No newline at end of file

gic-cloud-data-hook-service/src/main/resources/data-hook-flat-query-source.xml

@@ -3,18 +3,20 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:apollo="http://www.ctrip.com/schema/apollo"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 	http://www.springframework.org/schema/beans/spring-beans.xsd
 	http://www.springframework.org/schema/context
 	http://www.springframework.org/schema/context/spring-context.xsd
 	http://www.springframework.org/schema/tx
-	http://www.springframework.org/schema/tx/spring-tx.xsd">
+	http://www.springframework.org/schema/tx/spring-tx.xsd http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
 
+    <apollo:config namespaces="application"/>
     <bean class="org.apache.commons.dbcp.BasicDataSource" id="hiveSource" destroy-method="close">
         <property name="driverClassName" value="org.apache.hive.jdbc.HiveDriver" />
         <!--<property name="url" value="jdbc:hive2://115.159.205.44:10015/data_test" />-->
-        <property name="url" value="jdbc:hive2://10.105.14.41:10015/data_test" />
-        <property name="username" value="hadoop" />
+        <property name="url" value="${hive.url}" />
+        <property name="username" value="${hive.username}" />
         <property name="password" value="" />
         <property name="maxActive">
             <value>20</value>

gic-cloud-data-hook-service/src/main/resources/data-hook-free-query-source.xml

@@ -8,7 +8,9 @@
 	http://www.springframework.org/schema/context
 	http://www.springframework.org/schema/context/spring-context.xsd
 	http://www.springframework.org/schema/tx
-	http://www.springframework.org/schema/tx/spring-tx.xsd">
+	http://www.springframework.org/schema/tx/spring-tx.xsd
+    http://www.ctrip.com/schema/apollo
+	http://www.ctrip.com/schema/apollo.xsd">
 
     <bean class="org.apache.commons.dbcp.BasicDataSource" id="mysqlSource" destroy-method="close">
         <property name="driverClassName" value="com.mysql.jdbc.Driver" />

gic-cloud-data-hook-service/src/main/resources/data-hook-service-druid-prod.xml

@@ -3,17 +3,20 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:apollo="http://www.ctrip.com/schema/apollo"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 	http://www.springframework.org/schema/beans/spring-beans.xsd
 	http://www.springframework.org/schema/context
 	http://www.springframework.org/schema/context/spring-context.xsd
 	http://www.springframework.org/schema/tx
-	http://www.springframework.org/schema/tx/spring-tx.xsd">
+	http://www.springframework.org/schema/tx/spring-tx.xsd
+    http://www.ctrip.com/schema/apollo
+	http://www.ctrip.com/schema/apollo.xsd">
 
     <context:annotation-config />
     <!--<context:component-scan base-package="com.gic.cloud" />-->
-    <context:property-placeholder location="file:./config/data-hook-service-jdbc.properties" ignore-unresolvable="true"  />
-
+    <!-- <context:property-placeholder location="file:./config/data-hook-service-jdbc.properties" ignore-unresolvable="true"  />-->
+    <apollo:config namespaces="application"/>
     <bean class="com.alibaba.druid.pool.DruidDataSource" id="dataSource">
         <!-- 基本属性 url、user、password -->
         <property name="url" value="${jdbc.url}" />

gic-cloud-data-hook/pom.xml

@@ -2,6 +2,11 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>com.gic</groupId>
+		<artifactId>gic-pom-base</artifactId>
+		<version>3.0-SNAPSHOT</version>
+	</parent>
 	<groupId>com.gic</groupId>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>gic-cloud-data-hook</artifactId>
@@ -38,6 +43,11 @@
 			<artifactId>gic-cloud-commons</artifactId>
 			<version>${cloudCommonsVersion}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-enterprise-api</artifactId>
+			<version>${gic-enterprise-api}</version>
+		</dependency>
 		<!--<dependency>
 			<groupId>com.gic</groupId>
 			<artifactId>gic-cloud-web-service-api</artifactId>