From 62afc7f9c69fd2290dc6158f498002824aa1e2ca Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 14 Sep 2016 14:10:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/database.properties         |  2 +-
 .../resources/spring/applicationContext-dal.xml    | 56 --------------------
 .../resources/spring/applicationContext-slave.xml  | 59 ++++++++++++++++++++++
 .../main/resources/spring/applicationContext.xml   |  3 ++
 4 files changed, 63 insertions(+), 57 deletions(-)
 create mode 100644 platform-operate-api/src/main/resources/spring/applicationContext-slave.xml

diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties
index d428690..05b4def 100644
--- a/platform-operate-api/src/main/resources/database.properties
+++ b/platform-operate-api/src/main/resources/database.properties
@@ -20,7 +20,7 @@ mongo.slaveOk=${mongo.slaveOk}
 
 
 #服务启动方式  1院内单机方式  2 服务器方式#
-server.startup=1
+server.startup=2
 
 mysql.slave.driver=com.mysql.jdbc.Driver
 mysql.slave.jdbcurl=jdbc:mysql://192.168.5.250:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml b/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml
index 6395f62..73c250a 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml
@@ -45,62 +45,6 @@
     </bean>
     <!--我们自己的公网服务器库 end-->
 
-    <!-- 配置数据源  -->
-    <bean name="dataSourceB" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-        <property name="url" value="${mysql.slave.jdbcurl}"/>
-         <property name="username" value="${mysql.slave.db.name}"/>
-         <property name="password" value="${mysql.slave.db.password}"/>
-        <property name="initialSize" value="10"/>
-        <property name="maxActive" value="100"/>
-        <property name="maxIdle" value="10"/>
-        <property name="minIdle" value="0"/>
-        <property name="maxWait" value="10000"/>
-        <!-- <property name="validationQuery" value="${validationQuery3}" /> -->
-        <property name="testOnBorrow" value="false"/>
-        <property name="testOnReturn" value="false"/>
-        <property name="testWhileIdle" value="true"/>
-        <property name="timeBetweenEvictionRunsMillis" value="60000"/>
-        <property name="minEvictableIdleTimeMillis" value="25200000"/>
-        <property name="removeAbandoned" value="true"/>
-        <property name="removeAbandonedTimeout" value="1800"/>
-        <property name="logAbandoned" value="true"/>
-        <property name="filters" value="stat"/>
-    </bean>
-
-
-    <bean id="mainJdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate"
-          p:dataSource-ref="dataSourceB"/>
-
-    <bean id="mainSqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="dataSourceB"/>
-        <property name="mapperLocations">
-            <list>
-                <value>classpath*:mainOrm/slave/*.xml</value>
-            </list>
-        </property>
-    </bean>
-
-    <!-- all class in the back-package are auto loaded as a mapper -->
-    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="sqlSessionFactoryBeanName" value="mainSqlSessionFactory"></property>
-        <property name="basePackage" value="com.lyms.platform.permission.dao.slave"/>
-    </bean>
-
-
-    <!-- manage transaction
-    <bean id="mainTransactionManager"
-          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="dataSourceB"/>
-    </bean>
-
-    <tx:annotation-driven transaction-manager="mainTransactionManager"/> -->
-
-    <!-- Mabatis Data Layer -->
-    <bean id="mainSqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
-        <constructor-arg index="0" ref="mainSqlSessionFactory"/>
-    </bean>
-
-
     <!-- DataSource configuration 数据仓库主数据库 -->
     <bean id="reportDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
         <property name="driverClass" value="${report.driver}"/>
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-slave.xml b/platform-operate-api/src/main/resources/spring/applicationContext-slave.xml
new file mode 100644
index 0000000..17949d4
--- /dev/null
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-slave.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/tx      http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
+
+
+    <bean name="dataSourceB" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+        <property name="url" value="${mysql.slave.jdbcurl}"/>
+        <property name="username" value="${mysql.slave.db.name}"/>
+        <property name="password" value="${mysql.slave.db.password}"/>
+        <property name="initialSize" value="10"/>
+        <property name="maxActive" value="100"/>
+        <property name="maxIdle" value="10"/>
+        <property name="minIdle" value="0"/>
+        <property name="maxWait" value="10000"/>
+        <property name="testOnBorrow" value="false"/>
+        <property name="testOnReturn" value="false"/>
+        <property name="testWhileIdle" value="true"/>
+        <property name="timeBetweenEvictionRunsMillis" value="60000"/>
+        <property name="minEvictableIdleTimeMillis" value="25200000"/>
+        <property name="removeAbandoned" value="true"/>
+        <property name="removeAbandonedTimeout" value="1800"/>
+        <property name="logAbandoned" value="true"/>
+        <property name="filters" value="stat"/>
+    </bean>
+
+
+    <bean id="mainJdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate"
+          p:dataSource-ref="dataSourceB"/>
+
+    <bean id="mainSqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
+        <property name="dataSource" ref="dataSourceB"/>
+        <property name="mapperLocations">
+            <list>
+                <value>classpath*:mainOrm/slave/*.xml</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+        <property name="sqlSessionFactoryBeanName" value="mainSqlSessionFactory"></property>
+        <property name="basePackage" value="com.lyms.platform.permission.dao.slave"/>
+    </bean>
+
+
+    <bean id="mainTransactionManager"
+          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSourceB"/>
+    </bean>
+
+    <tx:annotation-driven transaction-manager="mainTransactionManager"/>
+
+    <bean id="mainSqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
+        <constructor-arg index="0" ref="mainSqlSessionFactory"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml
index 4d9602d..7971c25 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml
@@ -26,6 +26,9 @@
     <import resource="classpath:/spring/applicationContext_biz_patient.xml"/>
     <import resource="classpath:/spring/spring-mongodb.xml"/>
     <import resource="classpath:/spring/applicationContext-dal.xml"/>
+    <!--医院单机版的时候需要打开
+    <import resource="classpath:/spring/applicationContext-slave.xml"/>-->
+
 
     <bean id="sessionProvider" class="com.lyms.platform.operate.web.session.SessionProvider">
         <property name="iSessionProviderMap">
-- 
1.8.3.1