Commit 95a69464 by manxiaoqiang

test pom

parent 921f0283
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
......
...@@ -64,24 +64,24 @@ ...@@ -64,24 +64,24 @@
<property name="password" value="${default.dataSource.password}"/> <property name="password" value="${default.dataSource.password}"/>
</bean> </bean>
<bean id="officeDataSource" parent="parentDataSource"> <bean id="officeDataSource" parent="parentDataSource">
<property name="url" value="${office.url}"/> <property name="url" value="${office.dataSource.url}"/>
<property name="username" value="${office.username}"/> <property name="username" value="${office.dataSource.username}"/>
<property name="password" value="${office.password}"/> <property name="password" value="${office.dataSource.password}"/>
</bean> </bean>
<bean id="tkioDataSource" parent="parentDataSource"> <bean id="tkioDataSource" parent="parentDataSource">
<property name="url" value="${tkio.url}"/> <property name="url" value="${tkio.dataSource.url}"/>
<property name="username" value="${tkio.username}"/> <property name="username" value="${tkio.dataSource.username}"/>
<property name="password" value="${tkio.password}"/> <property name="password" value="${tkio.dataSource.password}"/>
</bean> </bean>
<bean id="trackDataSource" parent="parentDataSource"> <bean id="trackDataSource" parent="parentDataSource">
<property name="url" value="${track.url}"/> <property name="url" value="${track.dataSource.url}"/>
<property name="username" value="${track.username}"/> <property name="username" value="${track.dataSource.username}"/>
<property name="password" value="${track.password}"/> <property name="password" value="${track.dataSource.password}"/>
</bean> </bean>
<bean id="dmpDataSource" parent="parentDataSource"> <bean id="dmpDataSource" parent="parentDataSource">
<property name="url" value="${dmp.url}"/> <property name="url" value="${dmp.dataSource.url}"/>
<property name="username" value="${dmp.username}"/> <property name="username" value="${dmp.dataSource.username}"/>
<property name="password" value="${dmp.password}"/> <property name="password" value="${dmp.dataSource.password}"/>
</bean> </bean>
<!-- JPA实体管理工厂的配置 --> <!-- JPA实体管理工厂的配置 -->
......
...@@ -5,18 +5,18 @@ default.dataSource.username=${default.datasource.username} ...@@ -5,18 +5,18 @@ default.dataSource.username=${default.datasource.username}
default.dataSource.password=${default.datasource.password} default.dataSource.password=${default.datasource.password}
office.url=${office.url} office.dataSource.url=${office.url}
office.username=${office.username} office.dataSource.username=${office.username}
office.password=${office.password} office.dataSource.password=${office.password}
tkio.url=${tkio.url} tkio.dataSource.url=${tkio.url}
tkio.username=${tkio.username} tkio.dataSource.username=${tkio.username}
tkio.password=${tkio.password} tkio.dataSource.password=${tkio.password}
track.url=${track.url} track.dataSource.url=${track.url}
track.username=${track.username} track.dataSource.username=${track.username}
track.password=${track.password} track.dataSource.password=${track.password}
dmp.url=${dmp.url} dmp.dataSource.url=${dmp.url}
dmp.username=${dmp.username} dmp.dataSource.username=${dmp.username}
dmp.password=${dmp.password} dmp.dataSource.password=${dmp.password}
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment