Merge pull request iBase4J#23 from iBase4J/develop

缓存优化：Service使用redisson管理数据缓存；Web使用Spring-data-redis管理会话缓存
007gzs · Aug 19, 2017 · 9f16c0a · 9f16c0a
2 parents 0dd575c + c1b8c88
commit 9f16c0a
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 80 deletions.
diff --git a/iBase4J-Common/src/main/java/org/ibase4j/core/aspect/DataSourceAspect.java b/iBase4J-Common/src/main/java/org/ibase4j/core/aspect/DataSourceAspect.java
diff --git a/iBase4J-Common/src/main/java/org/ibase4j/core/base/BaseProviderImpl.java b/iBase4J-Common/src/main/java/org/ibase4j/core/base/BaseProviderImpl.java
@@ -6,6 +6,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.ibase4j.core.Constants;
+import org.ibase4j.core.support.dbcp.ChooseDataSource;
+import org.ibase4j.core.support.dbcp.HandleDataSource;
 import org.ibase4j.core.util.ExceptionUtil;
 import org.ibase4j.core.util.InstanceUtil;
 import org.springframework.beans.BeansException;
@@ -33,6 +35,20 @@ public Parameter execute(Parameter parameter) {
  Map<?, ?> map = parameter.getMap();
  String method = parameter.getMethod();
  Object[] param = parameter.getParam();
+ try {
+ L: for (String key : ChooseDataSource.METHODTYPE.keySet()) {
+ for (String type : ChooseDataSource.METHODTYPE.get(key)) {
+ if (method.startsWith(type)) {
+ logger.info(key);
+ HandleDataSource.putDataSource(key);
+ break L;
+ }
+ }
+ }
+ } catch (Exception e) {
+ logger.error(e);
+ HandleDataSource.putDataSource("write");
+ }
  Object result = null;
  if (param != null) {
  result = InstanceUtil.invokeMethod(service, method, param);

diff --git a/...ibase4j/core/aspect/ChooseDataSource.java → ...j/core/support/dbcp/ChooseDataSource.java b/...ibase4j/core/aspect/ChooseDataSource.java → ...j/core/support/dbcp/ChooseDataSource.java
@@ -1,4 +1,4 @@
-package org.ibase4j.core.aspect;
+package org.ibase4j.core.support.dbcp;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...ibase4j/core/aspect/HandleDataSource.java → ...j/core/support/dbcp/HandleDataSource.java b/...ibase4j/core/aspect/HandleDataSource.java → ...j/core/support/dbcp/HandleDataSource.java
@@ -1,4 +1,4 @@
-package org.ibase4j.core.aspect;
+package org.ibase4j.core.support.dbcp;
 
 /**
  * @author ShenHuaJie

diff --git a/iBase4J-Common/src/main/resources/spring/dataSource.xml b/iBase4J-Common/src/main/resources/spring/dataSource.xml
@@ -70,7 +70,7 @@
  <property name="minEvictableIdleTimeMillis" value="${db.minEvictableIdleTimeMillis}" />
  <property name="timeBetweenEvictionRunsMillis" value="${db.timeBetweenEvictionRunsMillis}" />
  </bean>
- <bean id="dataSource" class="org.ibase4j.core.aspect.ChooseDataSource" lazy-init="true">
+ <bean id="dataSource" class="org.ibase4j.core.support.dbcp.ChooseDataSource" lazy-init="true">
  <description>数据源</description>
  <property name="targetDataSources">
  <map key-type="java.lang.String" value-type="javax.sql.DataSource">
@@ -90,8 +90,6 @@
  </map>
  </property>
  </bean>
- <!-- 切面 -->
- <bean class="org.ibase4j.core.aspect.DataSourceAspect" />
  <!-- -->
  <bean class="org.springframework.jdbc.core.JdbcTemplate">
  <constructor-arg ref="dataSource" />

diff --git a/iBase4J-Common/src/main/resources/spring/session.xml b/iBase4J-Common/src/main/resources/spring/session.xml
@@ -19,11 +19,6 @@
  <!--是否在从池中取出连接前进行检验,如果检验失败,则从池中去除连接并尝试取出另一个--> 
  <property name="testOnBorrow" value="${redis.testOnBorrow}" /> 
  </bean >
- <bean id="jedisShardInfo" class="org.ibase4j.core.support.cache.jedis.JedisShardInfo">
- <constructor-arg index="0" value="${redis.host}" />
- <constructor-arg index="1" value="${redis.port}" type="int" />
- <property name="password" value="${redis.password}" />
- </bean>
  <!-- redisCluster配置 -->
  <!-- <bean id="redisClusterConfiguration" class="org.springframework.data.redis.connection.RedisClusterConfiguration">
  <constructor-arg name="propertySource">
@@ -33,9 +28,10 @@
  </bean>
  </constructor-arg>
  </bean> -->
- <!-- redis服务器中心 --> 
+ <!-- redis服务器中心 -->
  <bean id="jedisConnectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
- p:pool-config-ref="jedisPoolConfig" p:shard-info-ref="jedisShardInfo" p:timeout="${redis.timeout}" />
+ p:host-name="${redis.host}" p:port="${redis.port}" p:password="${redis.password}"
+ p:pool-config-ref="jedisPoolConfig" p:timeout="${redis.timeout}" />
  <!-- SPRING-SESSION -->
  <bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration">
  <property name="maxInactiveIntervalInSeconds" value="${session.maxInactiveInterval}" />

diff --git a/pom.xml b/pom.xml
@@ -29,9 +29,9 @@
  <!-- 编码 -->
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <!-- spring版本号 -->
- <spring.version>5.0.0.M5</spring.version>
+ <spring.version>5.0.0.RC3</spring.version>
  <spring-session.version>2.0.0.M2</spring-session.version>
- <spring-data-redis.version>2.0.0.M4</spring-data-redis.version>
+ <spring-data-redis.version>2.0.0.RC2</spring-data-redis.version>
  <!-- 数据库 -->
  <mysql.version>5.1.39</mysql.version>
  <sharding-jdbc.version>1.4.1</sharding-jdbc.version>