System.currentTimeMillis()替换至SystemClock.now()

mybatis-plus/src/main/java/com/baomidou/mybatisplus/plugins/PerformanceInterceptor.java

@@ -15,11 +15,8 @@
  */
 package com.baomidou.mybatisplus.plugins;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
+import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.toolkit.SystemClock;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -36,7 +33,10 @@ import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 
-import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
 
 /**
  * <p>
@@ -67,9 +67,9 @@ public class PerformanceInterceptor implements Interceptor {
 		Configuration configuration = mappedStatement.getConfiguration();
 		String sql = getSql(boundSql, parameterObject, configuration);
 
-		long start = System.currentTimeMillis();
+		long start = SystemClock.now();
 		Object result = invocation.proceed();
-		long end = System.currentTimeMillis();
+		long end = SystemClock.now();
 		long timing = end - start;
 		System.err.println(" Time：" + timing + " ms" + " - ID：" + statementId + "\n Execute SQL：" + sql + "\n");
 		if (maxTime >= 1 && timing > maxTime) {

mybatis-plus/src/main/java/com/baomidou/mybatisplus/spring/MybatisMapperRefresh.java

@@ -15,17 +15,8 @@
  */
 package com.baomidou.mybatisplus.spring;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
+import com.baomidou.mybatisplus.MybatisConfiguration;
+import com.baomidou.mybatisplus.toolkit.SystemClock;
 import org.apache.ibatis.binding.MapperRegistry;
 import org.apache.ibatis.builder.xml.XMLMapperBuilder;
 import org.apache.ibatis.builder.xml.XMLMapperEntityResolver;
@@ -42,7 +33,16 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.util.ResourceUtils;
 
-import com.baomidou.mybatisplus.MybatisConfiguration;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
 
 /**
  * <p>
@@ -108,7 +108,7 @@ public class MybatisMapperRefresh implements Runnable {
 		 * 启动 XML 热加载
 		 */
 		if (enabled) {
-			beforeTime = System.currentTimeMillis();
+			beforeTime = SystemClock.now();
 			final MybatisMapperRefresh runnable = this;
 			new Thread(new Runnable() {
 
@@ -157,7 +157,7 @@ public class MybatisMapperRefresh implements Runnable {
 								}
 							}
 							if (MybatisConfiguration.IS_REFRESH) {
-								beforeTime = System.currentTimeMillis();
+								beforeTime = SystemClock.now();
 							}
 							MybatisConfiguration.IS_REFRESH = false;
 						} catch (Exception exception) {

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/MybatisMapperRefreshTest.java

@@ -15,20 +15,20 @@
  */
 package com.baomidou.mybatisplus.test;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
 import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 import com.baomidou.mybatisplus.spring.MybatisMapperRefresh;
 import com.baomidou.mybatisplus.test.mysql.MySqlInjector;
 import com.baomidou.mybatisplus.test.mysql.UserMapper;
 import com.baomidou.mybatisplus.test.mysql.UserMapperTest;
+import com.baomidou.mybatisplus.toolkit.SystemClock;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * <p>
@@ -59,7 +59,7 @@ public class MybatisMapperRefreshTest {
 				session = sessionFactory.openSession();
 				UserMapper userMapper = session.getMapper(UserMapper.class);
 				userMapper.selectListRow(new Pagination(1, 10));
-				resource[0].getFile().setLastModified(System.currentTimeMillis());
+				resource[0].getFile().setLastModified(SystemClock.now());
 				session.commit();
 				session.close();
 				Thread.sleep(5000);