11

src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java

@@ -355,6 +355,10 @@ public class UserUtils {
 			}
 		}
 		Object companyId = getCache("selectCompany");
+		if(companyId.equals("1")){
+			User user = userDao.get("1");
+			companyId = user.getComId();
+		}
 		if (companyId != null) {
 			Office company = (Office)CacheUtils.get(USER_CACHE, CACHE_COMPANY + companyId);
 			if (company == null) {

src/main/resources/jeeplus.properties

@@ -24,15 +24,15 @@ db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/ruihuaoa-activity-testenv?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.url=jdbc:mysql://192.168.110.61:3306/ruihuaoa-activity-data?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.url=jdbc:mysql://localhost:3306/ruihuaoa-activity-local?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-jdbc.url=jdbc:mysql://116.62.246.213:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 #jdbc.url=jdbc:mysql://172.16.182.240:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.url=jdbc:mysql://101.37.149.85:3306/ruihuaoa-jeeplus-info?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
 #jdbc.username=yangfan
-#jdbc.username=root
+jdbc.username=root
 #jdbc.username=root
 #jdbc.password=123456
 #jdbc.password=gangwan123
-#jdbc.password=root
+jdbc.password=root
 #jdbc.url=jdbc:mysql://120.26.207.193:3306/ruihuaoa-activity?useUnicode=true&characterEncoding=utf-8
 #jdbc.username=root
 #jdbc.password=GANGWAN123
@@ -53,12 +53,14 @@ jdbc.pool.maxActive=200
 jdbc.testSql=SELECT 'x' FROM DUAL
 
 #master
-master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+#master.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
+master.jdbc.url=jdbc:mysql://localhost:3306/total_process_master?useUnicode=true&characterEncoding=utf-8
 master.jdbc.username=root
 master.jdbc.password=root
 
 #slave
-slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
+#slave.jdbc.url=jdbc:mysql://192.168.2.4:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
+slave.jdbc.url=jdbc:mysql://localhost:3306/total_process_slave?useUnicode=true&characterEncoding=utf-8
 slave.jdbc.username=root
 slave.jdbc.password=root
 
@@ -68,7 +70,8 @@ redis.keyPrefix=jeeplus
 #redis.host=101.37.149.85
 redis.host=127.0.0.1
 #redis.host=192.168.110.61
-redis.port=6380
+#redis.port=6380
+redis.port=6379
 
 #============================#
 #===== System settings ======#

src/main/resources/mybatis.xml

@@ -1,8 +1,8 @@
 <?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:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc"  
-	xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="
+       xmlns:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+       xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx"
+       xmlns:util="http://www.springframework.org/schema/util" xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
@@ -10,86 +10,68 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd
 		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd"
-	default-lazy-init="true">
+       default-lazy-init="true">
 
- 	<!-- MyBatis begin -->
+    <!-- MyBatis begin -->
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="dynamicDataSource"/>
+        <property name="dataSource" ref="dataSource"/>
         <property name="typeAliasesPackage" value="com.jeeplus"/>
         <property name="typeAliasesSuperType" value="com.jeeplus.common.persistence.BaseEntity"/>
         <property name="mapperLocations" value="classpath:/mappings/**/*.xml"/>
-		<property name="configLocation" value="classpath:/mybatis-config.xml"></property>
+        <property name="configLocation" value="classpath:/mybatis-config.xml"></property>
     </bean>
-    
+
     <!-- 扫描basePackage下所有以@MyBatisDao注解的接口 -->
     <bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
         <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
         <property name="basePackage" value="com.jeeplus"/>
         <property name="annotationClass" value="com.jeeplus.common.persistence.annotation.MyBatisDao"/>
     </bean>
-    
+
     <!-- 定义事务 -->
-	<bean id="transactionManager" class="com.jeeplus.common.db.DynamicDataSourceTransactionManager">
-		<property name="dataSource" ref="dynamicDataSource" />
-	</bean>
-	
-	<!-- 配置 Annotation 驱动，扫描@Transactional注解的类定义事务  -->
-	<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true"/>
+    <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSource" />
+    </bean>
+
+    <!-- 配置 Annotation 驱动，扫描@Transactional注解的类定义事务  -->
+    <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true"/>
     <!-- MyBatis end -->
-    
-	<!-- 数据源配置, 使用 BoneCP 数据库连接池 -->
-	<bean id="abstractDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
-	    <!-- 数据源驱动类可不写，Druid默认会自动根据URL识别DriverClass -->
-	    <property name="driverClassName" value="${jdbc.driver}" />
-	    
-		<!-- 基本属性 url、user、password -->
-		<!--<property name="url" value="${jdbc.url}" />
-		<property name="username" value="${jdbc.username}" />
-		<property name="password" value="${jdbc.password}" />-->
-		
-		<!-- 配置初始化大小、最小、最大 -->
-		<property name="initialSize" value="${jdbc.pool.init}" />
-		<property name="minIdle" value="${jdbc.pool.minIdle}" /> 
-		<property name="maxActive" value="${jdbc.pool.maxActive}" />
-		
-		<!-- 配置获取连接等待超时的时间 -->
-		<property name="maxWait" value="60000" />
-		
-		<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
-		<property name="timeBetweenEvictionRunsMillis" value="60000" />
-		
-		<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
-		<property name="minEvictableIdleTimeMillis" value="300000" />
-		
-		<property name="validationQuery" value="${jdbc.testSql}" />
-		<property name="testWhileIdle" value="true" />
-		<property name="testOnBorrow" value="false" />
-		<property name="testOnReturn" value="false" />
-		
-		<!-- 打开PSCache，并且指定每个连接上PSCache的大小（Oracle使用）
-		<property name="poolPreparedStatements" value="true" />
-		<property name="maxPoolPreparedStatementPerConnectionSize" value="20" /> -->
-		
-		<!-- 配置监控统计拦截的filters -->
-	    <property name="filters" value="stat" /> 
-	</bean>
 
-    <bean id="writeDataSource" parent="abstractDataSource">
-        <property name="url" value="${master.jdbc.url}" />
-        <property name="username" value="${master.jdbc.username}" />
-        <property name="password" value="${master.jdbc.password}" />
-    </bean>
+    <!-- 数据源配置, 使用 BoneCP 数据库连接池 -->
+    <bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
+        <!-- 数据源驱动类可不写，Druid默认会自动根据URL识别DriverClass -->
+        <property name="driverClassName" value="${jdbc.driver}" />
 
-    <bean id="readDataSource" parent="abstractDataSource">
-        <property name="url" value="${slave.jdbc.url}" />
-        <property name="username" value="${slave.jdbc.username}" />
-        <property name="password" value="${slave.jdbc.password}" />
-    </bean>
+        <!-- 基本属性 url、user、password -->
+        <property name="url" value="${jdbc.url}" />
+        <property name="username" value="${jdbc.username}" />
+        <property name="password" value="${jdbc.password}" />
 
+        <!-- 配置初始化大小、最小、最大 -->
+        <property name="initialSize" value="${jdbc.pool.init}" />
+        <property name="minIdle" value="${jdbc.pool.minIdle}" />
+        <property name="maxActive" value="${jdbc.pool.maxActive}" />
 
-    <bean id="dynamicDataSource" class="com.jeeplus.common.db.DynamicDataSource">
-        <property name="writeDataSource" ref="writeDataSource" />
-        <property name="readDataSource"  ref="readDataSource" />
+        <!-- 配置获取连接等待超时的时间 -->
+        <property name="maxWait" value="60000" />
+
+        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
+        <property name="timeBetweenEvictionRunsMillis" value="60000" />
+
+        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
+        <property name="minEvictableIdleTimeMillis" value="300000" />
+
+        <property name="validationQuery" value="${jdbc.testSql}" />
+        <property name="testWhileIdle" value="true" />
+        <property name="testOnBorrow" value="false" />
+        <property name="testOnReturn" value="false" />
+
+        <!-- 打开PSCache，并且指定每个连接上PSCache的大小（Oracle使用）
+        <property name="poolPreparedStatements" value="true" />
+        <property name="maxPoolPreparedStatementPerConnectionSize" value="20" /> -->
+
+        <!-- 配置监控统计拦截的filters -->
+        <property name="filters" value="stat" />
     </bean>
-	
+
 </beans>

src/main/resources/spring-context-activiti.xml

@@ -21,7 +21,7 @@
 	
 	<!-- Activiti begin -->
 	<bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
-		<property name="dataSource" ref="dynamicDataSource" />
+		<property name="dataSource" ref="dataSource" />
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="deploymentResources" value="classpath*:/act/deployments/**/*.bar"/>
 		<property name="databaseSchemaUpdate" value="true" />