代码格式化

zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       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="zheng-cms-admin"/>
+    <dubbo:application name="zheng-cms-admin"/>
 
     <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181"/>
 
-	<!-- 订阅服务 -->
-	<dubbo:consumer check="false" />
+    <!-- 订阅服务 -->
+    <dubbo:consumer check="false"/>
 
-	<dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService" />
+    <dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService"/>
 
-	<dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService" />
+    <dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService"/>
 
-	<dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService" />
+    <dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService"/>
 
-	<dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService" />
+    <dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService"/>
 
-	<dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService" />
+    <dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService"/>
 
 </beans>

zheng-cms/zheng-cms-job/src/main/resources/applicationContext-dubbo-consumer.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       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="zheng-cms-job"/>
+    <dubbo:application name="zheng-cms-job"/>
 
     <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181"/>
 
-	<!-- 订阅服务 -->
-	<dubbo:consumer check="false" />
+    <!-- 订阅服务 -->
+    <dubbo:consumer check="false"/>
 
-	<dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService" />
+    <dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService"/>
 
-	<dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService" />
+    <dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService"/>
 
-	<dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService" />
+    <dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService"/>
 
-	<dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService" />
+    <dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService"/>
 
-	<dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService" />
+    <dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService"/>
 
 </beans>

zheng-cms/zheng-cms-rpc-service/src/main/resources/applicationContext-jdbc.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
           http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans.xsd
           http://www.springframework.org/schema/tx
@@ -14,69 +14,70 @@
           http://www.springframework.org/schema/aop
           http://www.springframework.org/schema/aop/spring-aop.xsd">
 
-	<!-- 引入jdbc配置文件 -->
-	<!--<context:property-placeholder location="classpath:jdbc.properties" />-->
-	<!-- 配置进行解密  -->
-	<bean id="propertyConfigurer" class="com.zheng.common.plugin.EncryptPropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>classpath:jdbc.properties</value>
-				<value>classpath:redis.properties</value>
-			</list>
-		</property>
-	</bean>
-	
-	<!-- 主库数据源 -->
-	<bean id="masterDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-		<!-- 基本属性 url、user、password -->
-		<property name="driverClassName" value="${master.jdbc.driver}" />
-		<property name="url" value="${master.jdbc.url}" />
-		<property name="username" value="${master.jdbc.username}" />
-		<property name="password" value="${master.jdbc.password}" />
-		<!-- 配置初始化大小、最小、最大 -->
-		<property name="initialSize" value="1" />
-		<property name="minIdle" value="1" />
-		<property name="maxActive" value="20" />
-		<!-- 配置获取连接等待超时的时间 -->
-		<property name="maxWait" value="60000" />
-		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
-		<property name="timeBetweenEvictionRunsMillis" value="60000" />
-		<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
-		<property name="minEvictableIdleTimeMillis" value="300000" />
-		<!-- 校验语句 -->
-		<property name="validationQuery" value="SELECT 1" />
-		<property name="testWhileIdle" value="true" />
-		<property name="testOnBorrow" value="false" />
-		<property name="testOnReturn" value="false" />
-		<!-- 配置监控统计拦截的filters -->
-		<property name="filters" value="stat" />
-	</bean>
+    <!-- 引入jdbc配置文件 -->
+    <!--<context:property-placeholder location="classpath:jdbc.properties" />-->
+    <!-- 配置进行解密  -->
+    <bean id="propertyConfigurer" class="com.zheng.common.plugin.EncryptPropertyPlaceholderConfigurer">
+        <property name="locations">
+            <list>
+                <value>classpath:jdbc.properties</value>
+                <value>classpath:redis.properties</value>
+            </list>
+        </property>
+    </bean>
 
-	<!-- 从库数据源 -->
-	<bean id="slaveDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-		<!-- 基本属性 url、user、password -->
-		<property name="driverClassName" value="${slave.jdbc.driver}" />
-		<property name="url" value="${slave.jdbc.url}" />
-		<property name="username" value="${slave.jdbc.username}" />
-		<property name="password" value="${slave.jdbc.password}" />
-		<!-- 配置初始化大小、最小、最大 -->
-		<property name="initialSize" value="1" />
-		<property name="minIdle" value="1" />
-		<property name="maxActive" value="20" />
-		<!-- 配置获取连接等待超时的时间 -->
-		<property name="maxWait" value="60000" />
-		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
-		<property name="timeBetweenEvictionRunsMillis" value="60000" />
-		<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
-		<property name="minEvictableIdleTimeMillis" value="300000" />
-		<!-- 校验语句 -->
-		<property name="validationQuery" value="SELECT 1" />
-		<property name="testWhileIdle" value="true" />
-		<property name="testOnBorrow" value="false" />
-		<property name="testOnReturn" value="false" />
-		<!-- 配置监控统计拦截的filters -->
-		<property name="filters" value="stat" />
-	</bean>
+    <!-- 主库数据源 -->
+    <bean id="masterDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init"
+          destroy-method="close">
+        <!-- 基本属性 url、user、password -->
+        <property name="driverClassName" value="${master.jdbc.driver}"/>
+        <property name="url" value="${master.jdbc.url}"/>
+        <property name="username" value="${master.jdbc.username}"/>
+        <property name="password" value="${master.jdbc.password}"/>
+        <!-- 配置初始化大小、最小、最大 -->
+        <property name="initialSize" value="1"/>
+        <property name="minIdle" value="1"/>
+        <property name="maxActive" value="20"/>
+        <!-- 配置获取连接等待超时的时间 -->
+        <property name="maxWait" value="60000"/>
+        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
+        <property name="timeBetweenEvictionRunsMillis" value="60000"/>
+        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
+        <property name="minEvictableIdleTimeMillis" value="300000"/>
+        <!-- 校验语句 -->
+        <property name="validationQuery" value="SELECT 1"/>
+        <property name="testWhileIdle" value="true"/>
+        <property name="testOnBorrow" value="false"/>
+        <property name="testOnReturn" value="false"/>
+        <!-- 配置监控统计拦截的filters -->
+        <property name="filters" value="stat"/>
+    </bean>
+
+    <!-- 从库数据源 -->
+    <bean id="slaveDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+        <!-- 基本属性 url、user、password -->
+        <property name="driverClassName" value="${slave.jdbc.driver}"/>
+        <property name="url" value="${slave.jdbc.url}"/>
+        <property name="username" value="${slave.jdbc.username}"/>
+        <property name="password" value="${slave.jdbc.password}"/>
+        <!-- 配置初始化大小、最小、最大 -->
+        <property name="initialSize" value="1"/>
+        <property name="minIdle" value="1"/>
+        <property name="maxActive" value="20"/>
+        <!-- 配置获取连接等待超时的时间 -->
+        <property name="maxWait" value="60000"/>
+        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
+        <property name="timeBetweenEvictionRunsMillis" value="60000"/>
+        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
+        <property name="minEvictableIdleTimeMillis" value="300000"/>
+        <!-- 校验语句 -->
+        <property name="validationQuery" value="SELECT 1"/>
+        <property name="testWhileIdle" value="true"/>
+        <property name="testOnBorrow" value="false"/>
+        <property name="testOnReturn" value="false"/>
+        <!-- 配置监控统计拦截的filters -->
+        <property name="filters" value="stat"/>
+    </bean>
 
     <!-- 动态数据源 -->
     <bean id="dataSource" class="com.zheng.common.db.DynamicDataSource">
@@ -89,25 +90,25 @@
         </property>
         <property name="defaultTargetDataSource" ref="masterDataSource"></property>
     </bean>
-	
-	<!-- 为Mybatis创建SqlSessionFactory，同时指定数据源 -->
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="configLocation" value="classpath:mybatis-config.xml" />
-		<property name="mapperLocations" value="classpath*:**/mapper/*Mapper.xml" />
-	</bean>
-	<!-- Mapper接口所在包名，Spring会自动查找其下的Mapper -->
-	<bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="**.mapper" />
-		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
-	</bean>
 
-	<!-- 事务管理器 -->
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-	
-	<!-- 启动注解事务 -->
-	<tx:annotation-driven transaction-manager="transactionManager"/>
+    <!-- 为Mybatis创建SqlSessionFactory，同时指定数据源 -->
+    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="configLocation" value="classpath:mybatis-config.xml"/>
+        <property name="mapperLocations" value="classpath*:**/mapper/*Mapper.xml"/>
+    </bean>
+    <!-- Mapper接口所在包名，Spring会自动查找其下的Mapper -->
+    <bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+        <property name="basePackage" value="**.mapper"/>
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+    </bean>
+
+    <!-- 事务管理器 -->
+    <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <!-- 启动注解事务 -->
+    <tx:annotation-driven transaction-manager="transactionManager"/>
 
 </beans>

zheng-cms/zheng-cms-search/src/main/resources/applicationContext-dubbo-consumer.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       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="zheng-cms-search"/>
+    <dubbo:application name="zheng-cms-search"/>
 
     <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181"/>
 
-	<!-- 订阅服务 -->
-	<dubbo:consumer check="false" />
+    <!-- 订阅服务 -->
+    <dubbo:consumer check="false"/>
 
-	<dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService" />
+    <dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService"/>
 
-	<dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService" />
+    <dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService"/>
 
-	<dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService" />
+    <dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService"/>
 
-	<dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService" />
+    <dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService"/>
 
-	<dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService" />
+    <dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService"/>
 
 </beans>

zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       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="zheng-cms-web"/>
+    <dubbo:application name="zheng-cms-web"/>
 
     <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181"/>
 
-	<!-- 订阅服务 -->
-	<dubbo:consumer check="false" />
+    <!-- 订阅服务 -->
+    <dubbo:consumer check="false"/>
 
-	<dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService" />
+    <dubbo:reference id="cmsArticleService" interface="com.zheng.cms.rpc.api.CmsArticleService"/>
 
-	<dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService" />
+    <dubbo:reference id="cmsCategoryService" interface="com.zheng.cms.rpc.api.CmsCategoryService"/>
 
-	<dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService" />
+    <dubbo:reference id="cmsCommentService" interface="com.zheng.cms.rpc.api.CmsCommentService"/>
 
-	<dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService" />
+    <dubbo:reference id="cmsTagService" interface="com.zheng.cms.rpc.api.CmsTagService"/>
 
-	<dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService" />
+    <dubbo:reference id="userService" interface="com.zheng.cms.rpc.api.UserService"/>
 
 </beans>

zheng-common/src/main/java/com/zheng/common/plugin/EncryptPropertyPlaceholderConfigurer.java

@@ -10,7 +10,7 @@ import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 public class EncryptPropertyPlaceholderConfigurer extends PropertyPlaceholderConfigurer {
 
 	private String[] propertyNames = {
-			"master.jdbc.password", "slave.jdbc.password", "generator.jdbc.password", "master.redis.password"
+		"master.jdbc.password", "slave.jdbc.password", "generator.jdbc.password", "master.redis.password"
 	};
 
 	/**

zheng-common/src/main/java/com/zheng/common/util/PropertiesFileUtil.java

@@ -20,6 +20,8 @@ public class PropertiesFileUtil {
     private ResourceBundle resourceBundle = null;
     // 默认资源文件名称
     private static final String NAME = "config";
+    // 缓存时间
+    private static final Integer TIME_OUT = 60 * 1000;
 
     // 私有构造方法，创建单例
     private PropertiesFileUtil(String name) {
@@ -38,7 +40,7 @@ public class PropertiesFileUtil {
             configMap.put(name, conf);
         }
         // 判断是否打开的资源文件是否超时1分钟
-        if ((new Date().getTime() - conf.getLoadTime().getTime()) > 60*1000) {
+        if ((new Date().getTime() - conf.getLoadTime().getTime()) > TIME_OUT) {
             conf = new PropertiesFileUtil(name);
             configMap.put(name, conf);
         }

zheng-upms/zheng-upms-rpc-service/src/main/resources/applicationContext-jdbc.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
           http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans.xsd
           http://www.springframework.org/schema/tx
@@ -14,69 +14,70 @@
           http://www.springframework.org/schema/aop
           http://www.springframework.org/schema/aop/spring-aop.xsd">
 
-	<!-- 引入jdbc配置文件 -->
-	<!--<context:property-placeholder location="classpath:jdbc.properties" />-->
-	<!-- 配置进行解密  -->
-	<bean id="propertyConfigurer" class="com.zheng.common.plugin.EncryptPropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>classpath:jdbc.properties</value>
-				<value>classpath:redis.properties</value>
-			</list>
-		</property>
-	</bean>
-	
-	<!-- 主库数据源 -->
-	<bean id="masterDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-		<!-- 基本属性 url、user、password -->
-		<property name="driverClassName" value="${master.jdbc.driver}" />
-		<property name="url" value="${master.jdbc.url}" />
-		<property name="username" value="${master.jdbc.username}" />
-		<property name="password" value="${master.jdbc.password}" />
-		<!-- 配置初始化大小、最小、最大 -->
-		<property name="initialSize" value="1" />
-		<property name="minIdle" value="1" />
-		<property name="maxActive" value="20" />
-		<!-- 配置获取连接等待超时的时间 -->
-		<property name="maxWait" value="60000" />
-		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
-		<property name="timeBetweenEvictionRunsMillis" value="60000" />
-		<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
-		<property name="minEvictableIdleTimeMillis" value="300000" />
-		<!-- 校验语句 -->
-		<property name="validationQuery" value="SELECT 1" />
-		<property name="testWhileIdle" value="true" />
-		<property name="testOnBorrow" value="false" />
-		<property name="testOnReturn" value="false" />
-		<!-- 配置监控统计拦截的filters -->
-		<property name="filters" value="stat" />
-	</bean>
+    <!-- 引入jdbc配置文件 -->
+    <!--<context:property-placeholder location="classpath:jdbc.properties" />-->
+    <!-- 配置进行解密  -->
+    <bean id="propertyConfigurer" class="com.zheng.common.plugin.EncryptPropertyPlaceholderConfigurer">
+        <property name="locations">
+            <list>
+                <value>classpath:jdbc.properties</value>
+                <value>classpath:redis.properties</value>
+            </list>
+        </property>
+    </bean>
 
-	<!-- 从库数据源 -->
-	<bean id="slaveDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-		<!-- 基本属性 url、user、password -->
-		<property name="driverClassName" value="${slave.jdbc.driver}" />
-		<property name="url" value="${slave.jdbc.url}" />
-		<property name="username" value="${slave.jdbc.username}" />
-		<property name="password" value="${slave.jdbc.password}" />
-		<!-- 配置初始化大小、最小、最大 -->
-		<property name="initialSize" value="1" />
-		<property name="minIdle" value="1" />
-		<property name="maxActive" value="20" />
-		<!-- 配置获取连接等待超时的时间 -->
-		<property name="maxWait" value="60000" />
-		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
-		<property name="timeBetweenEvictionRunsMillis" value="60000" />
-		<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
-		<property name="minEvictableIdleTimeMillis" value="300000" />
-		<!-- 校验语句 -->
-		<property name="validationQuery" value="SELECT 1" />
-		<property name="testWhileIdle" value="true" />
-		<property name="testOnBorrow" value="false" />
-		<property name="testOnReturn" value="false" />
-		<!-- 配置监控统计拦截的filters -->
-		<property name="filters" value="stat" />
-	</bean>
+    <!-- 主库数据源 -->
+    <bean id="masterDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init"
+          destroy-method="close">
+        <!-- 基本属性 url、user、password -->
+        <property name="driverClassName" value="${master.jdbc.driver}"/>
+        <property name="url" value="${master.jdbc.url}"/>
+        <property name="username" value="${master.jdbc.username}"/>
+        <property name="password" value="${master.jdbc.password}"/>
+        <!-- 配置初始化大小、最小、最大 -->
+        <property name="initialSize" value="1"/>
+        <property name="minIdle" value="1"/>
+        <property name="maxActive" value="20"/>
+        <!-- 配置获取连接等待超时的时间 -->
+        <property name="maxWait" value="60000"/>
+        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
+        <property name="timeBetweenEvictionRunsMillis" value="60000"/>
+        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
+        <property name="minEvictableIdleTimeMillis" value="300000"/>
+        <!-- 校验语句 -->
+        <property name="validationQuery" value="SELECT 1"/>
+        <property name="testWhileIdle" value="true"/>
+        <property name="testOnBorrow" value="false"/>
+        <property name="testOnReturn" value="false"/>
+        <!-- 配置监控统计拦截的filters -->
+        <property name="filters" value="stat"/>
+    </bean>
+
+    <!-- 从库数据源 -->
+    <bean id="slaveDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+        <!-- 基本属性 url、user、password -->
+        <property name="driverClassName" value="${slave.jdbc.driver}"/>
+        <property name="url" value="${slave.jdbc.url}"/>
+        <property name="username" value="${slave.jdbc.username}"/>
+        <property name="password" value="${slave.jdbc.password}"/>
+        <!-- 配置初始化大小、最小、最大 -->
+        <property name="initialSize" value="1"/>
+        <property name="minIdle" value="1"/>
+        <property name="maxActive" value="20"/>
+        <!-- 配置获取连接等待超时的时间 -->
+        <property name="maxWait" value="60000"/>
+        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
+        <property name="timeBetweenEvictionRunsMillis" value="60000"/>
+        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
+        <property name="minEvictableIdleTimeMillis" value="300000"/>
+        <!-- 校验语句 -->
+        <property name="validationQuery" value="SELECT 1"/>
+        <property name="testWhileIdle" value="true"/>
+        <property name="testOnBorrow" value="false"/>
+        <property name="testOnReturn" value="false"/>
+        <!-- 配置监控统计拦截的filters -->
+        <property name="filters" value="stat"/>
+    </bean>
 
     <!-- 动态数据源 -->
     <bean id="dataSource" class="com.zheng.common.db.DynamicDataSource">
@@ -89,25 +90,25 @@
         </property>
         <property name="defaultTargetDataSource" ref="masterDataSource"></property>
     </bean>
-	
-	<!-- 为Mybatis创建SqlSessionFactory，同时指定数据源 -->
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="configLocation" value="classpath:mybatis-config.xml" />
-		<property name="mapperLocations" value="classpath*:**/mapper/*Mapper.xml" />
-	</bean>
-	<!-- Mapper接口所在包名，Spring会自动查找其下的Mapper -->
-	<bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="**.mapper" />
-		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
-	</bean>
 
-	<!-- 事务管理器 -->
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-	
-	<!-- 启动注解事务 -->
-	<tx:annotation-driven transaction-manager="transactionManager"/>
+    <!-- 为Mybatis创建SqlSessionFactory，同时指定数据源 -->
+    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="configLocation" value="classpath:mybatis-config.xml"/>
+        <property name="mapperLocations" value="classpath*:**/mapper/*Mapper.xml"/>
+    </bean>
+    <!-- Mapper接口所在包名，Spring会自动查找其下的Mapper -->
+    <bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+        <property name="basePackage" value="**.mapper"/>
+        <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
+    </bean>
+
+    <!-- 事务管理器 -->
+    <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <!-- 启动注解事务 -->
+    <tx:annotation-driven transaction-manager="transactionManager"/>
 
 </beans>

zheng-upms/zheng-upms-server/src/main/resources/applicationContext-dubbo-consumer.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+       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="zheng-upms-server"/>
+    <dubbo:application name="zheng-upms-server"/>
 
     <dubbo:registry protocol="zookeeper" address="127.0.0.1:2181"/>
 
-	<!-- 订阅服务 -->
-	<dubbo:consumer check="false" />
+    <!-- 订阅服务 -->
+    <dubbo:consumer check="false"/>
 
-	<!-- 系统 -->
-	<dubbo:reference id="upmsSystemService" interface="com.zheng.upms.rpc.api.UpmsSystemService" />
-	<!-- 组织 -->
-	<dubbo:reference id="upmsOrganizationService" interface="com.zheng.upms.rpc.api.UpmsOrganizationService" />
-	<!-- 用户 -->
-	<dubbo:reference id="upmsUserService" interface="com.zheng.upms.rpc.api.UpmsUserService" />
-	<!-- 角色 -->
-	<dubbo:reference id="upmsRoleService" interface="com.zheng.upms.rpc.api.UpmsRoleService" />
-	<!-- 权限 -->
-	<dubbo:reference id="upmsPermissionService" interface="com.zheng.upms.rpc.api.UpmsPermissionService" />
-	<!-- 接口服务 -->
-	<dubbo:reference id="upmsApiService" interface="com.zheng.upms.rpc.api.UpmsApiService" />
+    <!-- 系统 -->
+    <dubbo:reference id="upmsSystemService" interface="com.zheng.upms.rpc.api.UpmsSystemService"/>
+    <!-- 组织 -->
+    <dubbo:reference id="upmsOrganizationService" interface="com.zheng.upms.rpc.api.UpmsOrganizationService"/>
+    <!-- 用户 -->
+    <dubbo:reference id="upmsUserService" interface="com.zheng.upms.rpc.api.UpmsUserService"/>
+    <!-- 角色 -->
+    <dubbo:reference id="upmsRoleService" interface="com.zheng.upms.rpc.api.UpmsRoleService"/>
+    <!-- 权限 -->
+    <dubbo:reference id="upmsPermissionService" interface="com.zheng.upms.rpc.api.UpmsPermissionService"/>
+    <!-- 接口服务 -->
+    <dubbo:reference id="upmsApiService" interface="com.zheng.upms.rpc.api.UpmsApiService"/>
 
 </beans>