iBase4J · iBase4J · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017 · Sep 12, 2017
diff --git a/iBase4J-Biz-Service/pom.xml b/iBase4J-Biz-Service/pom.xml
@@ -45,22 +45,16 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>${mysql.version}</version>
 		</dependency>
-		<!-- mybatis -->
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${mybatis.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis-spring</artifactId>
-			<version>${mybatis-spring.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
 			<version>${druid.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus</artifactId>
+			<version>${mybatis-plus.version}</version>
+		</dependency>
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>

diff --git a/iBase4J-Biz-Service/src/main/resources/log4j2.xml b/iBase4J-Biz-Service/src/main/resources/log4j2.xml
@@ -5,7 +5,6 @@
 		<!-- 日志备份目录 -->
 		<property name="BACKUP_HOME">backup</property>
 		<property name="SERVER_NAME">${project.artifactId}</property>
-		<property name="EVERY_FILE_SIZE">5M</property><!-- 日志切割的最小单位 -->
 		<property name="OUTPUT_LOG_LEVEL">DEBUG</property><!-- 日志输出级别 -->
 	</properties>
 	<appenders>
@@ -17,23 +16,15 @@
 			fileName="${LOG_HOME}/dev_${SERVER_NAME}.log"
 			filePattern="${LOG_HOME}/dev_${BACKUP_HOME}/dev_${SERVER_NAME}.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M] - %msg%n" />
-			<Policies>
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1" modulate="true" />
-            </Policies>
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
 			<Filters>
 				<ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL" />
 				<ThresholdFilter level="trace" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
             <DefaultRolloverStrategy>
-                <!-- 删除指定目录下7天之前的日志-->
-                <Delete basePath="${LOG_HOME}/${BACKUP_HOME}" maxDepth="1">
-                    <IfFileName glob="*/${SERVER_NAME}*.log" />
-                    <IfLastModified age="7d" />
-                </Delete>
-                <Delete basePath="${LOG_HOME}/dev_${BACKUP_HOME}" maxDepth="1">
-                    <IfFileName glob="*/dev_${SERVER_NAME}*.log" />
-                    <IfLastModified age="7d" />
+                <Delete basePath="${LOG_HOME}" maxDepth="2">
+                    <IfFileName glob="*.log" />
+                    <IfLastModified age="200H" />
                 </Delete>
             </DefaultRolloverStrategy>
 		</RollingFile>
@@ -42,10 +33,7 @@
 			fileName="${LOG_HOME}/dev_${SERVER_NAME}_error.log"
 			filePattern="${LOG_HOME}/dev_${BACKUP_HOME}/dev_${SERVER_NAME}_error.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%d{yyyy.MM.dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M:%L] - %msg%xEx%n" />
-			<Policies>  
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1" modulate="true" />
-            </Policies> 
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
 			<Filters>
 				<ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
@@ -55,10 +43,7 @@
 			fileName="${LOG_HOME}/${SERVER_NAME}.log"
 			filePattern="${LOG_HOME}/${BACKUP_HOME}/${SERVER_NAME}.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%d{yyyy.MM.dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M:%L] - %msg%xEx%n" />
-            <Policies>  
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1"  modulate="true" />  
-            </Policies>
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
         </RollingRandomAccessFile>
 	</appenders>
 
@@ -73,6 +58,7 @@
 		<logger name="org.springframework" level="INFO" />
 		<logger name="com.weibo.api.motan" level="INFO" />
 		<logger name="org.apache.zookeeper" level="WARN" />
+		<logger name="com.baomidou.mybatisplus" level="INFO" />
 		<logger name="org.springframework.web" level="${OUTPUT_LOG_LEVEL}" />
 		<Logger  name="org.ibase4j" level="${OUTPUT_LOG_LEVEL}" additivity="false" includeLocation="true">  
 			<appender-ref ref="Console" />

diff --git a/iBase4J-Biz-Web/src/main/resources/log4j2.xml b/iBase4J-Biz-Web/src/main/resources/log4j2.xml
@@ -5,7 +5,6 @@
 		<!-- 日志备份目录 -->
 		<property name="BACKUP_HOME">backup</property>
 		<property name="SERVER_NAME">${project.artifactId}</property>
-		<property name="EVERY_FILE_SIZE">5M</property><!-- 日志切割的最小单位 -->
 		<property name="OUTPUT_LOG_LEVEL">DEBUG</property><!-- 日志输出级别 -->
 	</properties>
 	<appenders>
@@ -17,23 +16,15 @@
 			fileName="${LOG_HOME}/dev_${SERVER_NAME}.log"
 			filePattern="${LOG_HOME}/dev_${BACKUP_HOME}/dev_${SERVER_NAME}.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M] - %msg%n" />
-			<Policies>
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1" modulate="true" />
-            </Policies>
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
 			<Filters>
 				<ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL" />
 				<ThresholdFilter level="trace" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
             <DefaultRolloverStrategy>
-                <!-- 删除指定目录下7天之前的日志-->
-                <Delete basePath="${LOG_HOME}/${BACKUP_HOME}" maxDepth="1">
-                    <IfFileName glob="*/${SERVER_NAME}*.log" />
-                    <IfLastModified age="7d" />
-                </Delete>
-                <Delete basePath="${LOG_HOME}/dev_${BACKUP_HOME}" maxDepth="1">
-                    <IfFileName glob="*/dev_${SERVER_NAME}*.log" />
-                    <IfLastModified age="7d" />
+                <Delete basePath="${LOG_HOME}" maxDepth="2">
+                    <IfFileName glob="*.log" />
+                    <IfLastModified age="200H" />
                 </Delete>
             </DefaultRolloverStrategy>
 		</RollingFile>
@@ -42,10 +33,7 @@
 			fileName="${LOG_HOME}/dev_${SERVER_NAME}_error.log"
 			filePattern="${LOG_HOME}/dev_${BACKUP_HOME}/dev_${SERVER_NAME}_error.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%d{yyyy.MM.dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M:%L] - %msg%xEx%n" />
-			<Policies>  
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1" modulate="true" />
-            </Policies> 
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
 			<Filters>
 				<ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY" />
 			</Filters>
@@ -55,23 +43,22 @@
 			fileName="${LOG_HOME}/${SERVER_NAME}.log"
 			filePattern="${LOG_HOME}/${BACKUP_HOME}/${SERVER_NAME}.%d{yyyy-MM-dd-HH}.log">
 			<PatternLayout pattern="%d{yyyy.MM.dd HH:mm:ss.SSS} [%thread] %level [%C{36}.%M:%L] - %msg%xEx%n" />
-            <Policies>  
-                <SizeBasedTriggeringPolicy size="${EVERY_FILE_SIZE}" />
-                <TimeBasedTriggeringPolicy interval="1"  modulate="true" />  
-            </Policies>
+			<CronTriggeringPolicy schedule="0 0 * * * ?" />
         </RollingRandomAccessFile>
 	</appenders>
 
 	<loggers>
 		<logger name="org.slf4j" level="INFO" />
 		<logger name="org.quartz" level="INFO" />
 		<logger name="org.redisson" level="INFO" />
+		<logger name="com.alibaba" level="WARN" />
 		<logger name="com.atomikos" level="WARN" />
 		<logger name="com.alibaba.dubbo" level="INFO" />
 		<logger name="org.apache.activemq" level="INFO" />
 		<logger name="org.springframework" level="INFO" />
 		<logger name="com.weibo.api.motan" level="INFO" />
 		<logger name="org.apache.zookeeper" level="WARN" />
+		<logger name="com.baomidou.mybatisplus" level="INFO" />
 		<logger name="org.springframework.web" level="${OUTPUT_LOG_LEVEL}" />
 		<Logger  name="org.ibase4j" level="${OUTPUT_LOG_LEVEL}" additivity="false" includeLocation="true">  
 			<appender-ref ref="Console" />

diff --git a/iBase4J-Common/pom.xml b/iBase4J-Common/pom.xml
@@ -39,9 +39,9 @@
 		</dependency>
 		<!-- mybatis -->
 		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${mybatis.version}</version>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus</artifactId>
+			<version>${mybatis-plus.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
@@ -165,6 +165,12 @@
 			<artifactId>reflectasm</artifactId>
 			<version>1.11.4-2</version>
 		</dependency>
+		<!-- activemq -->
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-spring</artifactId>
+			<version>${activemq.version}</version>
+		</dependency>
 		<!-- 二维码 -->
 		<dependency>
 			<groupId>com.google.zxing</groupId>

diff --git a/iBase4J-Common/src/main/java/org/ibase4j/Generator.java b/iBase4J-Common/src/main/java/org/ibase4j/Generator.java
@@ -14,7 +14,7 @@
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
 /**
- * 代码生成 注意：不生成service接口 注意：不生成service接口 注意：不生成service接口
+ * 代码生成
  * 
  * @author ShenHuaJie
  */

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,8 +6,6 @@
 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;
@@ -35,20 +33,6 @@ 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);
@@ -74,8 +58,6 @@ public Parameter execute(Parameter parameter) {
 			String msg = ExceptionUtil.getStackTraceAsString(e);
 			logger.error(no + " " + Constants.Exception_Head + msg, e);
 			throw e;
-		} finally {
-			HandleDataSource.clear();
 		}
 	}
 }
diff --git a/iBase4J-Common/src/main/java/org/ibase4j/core/base/BaseService.java b/iBase4J-Common/src/main/java/org/ibase4j/core/base/BaseService.java
@@ -94,6 +94,8 @@ public Page<T> getPage(final Page<Long> ids) {
 					public void run() {
 						try {
 							records.set(index, queryById(ids.getRecords().get(index)));
+						} catch (Exception e) {
+							logger.error("", e);
 						} finally {
 							thread.put(index, 0);
 						}
@@ -129,6 +131,8 @@ public Page<Map<String, Object>> getPageMap(final Page<Long> ids) {
 					public void run() {
 						try {
 							records.set(index, InstanceUtil.transBean2Map(queryById(ids.getRecords().get(index))));
+						} catch (Exception e) {
+							logger.error("", e);
 						} finally {
 							thread.put(index, 0);
 						}
@@ -166,6 +170,8 @@ public void run() {
 							T t = queryById(ids.getRecords().get(index));
 							K k = InstanceUtil.to(t, cls);
 							records.set(index, k);
+						} catch (Exception e) {
+							logger.error("", e);
 						} finally {
 							thread.put(index, 0);
 						}
@@ -199,6 +205,8 @@ public List<T> getList(final List<Long> ids) {
 					public void run() {
 						try {
 							list.set(index, queryById(ids.get(index)));
+						} catch (Exception e) {
+							logger.error("", e);
 						} finally {
 							thread.put(index, 0);
 						}
@@ -232,6 +240,8 @@ public void run() {
 							T t = queryById(ids.get(index));
 							K k = InstanceUtil.to(t, cls);
 							list.set(index, k);
+						} catch (Exception e) {
+							logger.error("", e);
 						} finally {
 							thread.put(index, 0);
 						}

diff --git a/iBase4J-Common/src/main/java/org/ibase4j/core/support/dbcp/DataSourceAspect.java b/iBase4J-Common/src/main/java/org/ibase4j/core/support/dbcp/DataSourceAspect.java
@@ -0,0 +1,51 @@
+package org.ibase4j.core.support.dbcp;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.ibase4j.core.base.Parameter;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+public class DataSourceAspect {
+	private final Logger logger = LogManager.getLogger();
+
+	@Pointcut("this(org.ibase4j.core.base.BaseProviderImpl)")
+	public void aspect() {
+	}
+
+	/**
+	 * 配置前置通知,使用在方法aspect()上注册的切入点
+	 */
+	@Before("aspect()")
+	public void before(JoinPoint point) {
+		Parameter parameter = (Parameter) point.getArgs()[0];
+		String method = parameter.getMethod();
+		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");
+		}
+	}
+
+	@After("aspect()")
+	public void after(JoinPoint point) {
+		HandleDataSource.clear();
+	}
+}
diff --git a/iBase4J-Common/src/main/java/org/ibase4j/core/util/CacheUtil.java b/iBase4J-Common/src/main/java/org/ibase4j/core/util/CacheUtil.java
@@ -40,7 +40,7 @@ public static boolean getLock(String key) {
 				}
 			}
 			int expires = 1000 * 60 * 3;
-			String currentValue = (String) getCache().get(key);
+			String currentValue = String.valueOf(getCache().get(key));
 			if (currentValue != null && Long.parseLong(currentValue) < System.currentTimeMillis() - expires) {
 				unlock(key);
 				return getLock(key);