1.修复PerformanceInterceptor替换?导致打印SQL不准确问题

2.添加格式化SQL设置
3.废除MessageFormat填充占位符方式,使用String替换
4.其他优化项

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

@@ -16,6 +16,8 @@
 package com.baomidou.mybatisplus.plugins;
 
 import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.toolkit.SqlUtils;
+import com.baomidou.mybatisplus.toolkit.StringUtils;
 import com.baomidou.mybatisplus.toolkit.SystemClock;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.BoundSql;
@@ -33,8 +35,7 @@ import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
@@ -46,7 +47,9 @@ import java.util.Properties;
  * @author hubin
  * @Date 2016-07-07
  */
-@Intercepts({@Signature(type = Executor.class, method = "query", args = { MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class }),
+@Intercepts({
+		@Signature(type = Executor.class, method = "query", args = { MappedStatement.class, Object.class, RowBounds.class,
+				ResultHandler.class }),
 		@Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) })
 public class PerformanceInterceptor implements Interceptor {
 
@@ -55,6 +58,8 @@ public class PerformanceInterceptor implements Interceptor {
 	 */
 	private long maxTime = 0;
 
+	private boolean format = false;
+
 	public Object intercept(Invocation invocation) throws Throwable {
 		MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
 		Object parameterObject = null;
@@ -65,13 +70,16 @@ public class PerformanceInterceptor implements Interceptor {
 		String statementId = mappedStatement.getId();
 		BoundSql boundSql = mappedStatement.getBoundSql(parameterObject);
 		Configuration configuration = mappedStatement.getConfiguration();
-		String sql = getSql(boundSql, parameterObject, configuration);
+		String sql = SqlUtils.sqlFormat(boundSql.getSql(), format);
+
+		List<String> params = getParams(boundSql, parameterObject, configuration);
 
 		long start = SystemClock.now();
 		Object result = invocation.proceed();
 		long end = SystemClock.now();
 		long timing = end - start;
-		System.err.println(" Time：" + timing + " ms" + " - ID：" + statementId + "\n Execute SQL：" + sql + "\n");
+		System.err.println(" Time：" + timing + " ms" + " - ID：" + statementId + "\n SQL Params:" + params.toString()
+				+ "\n Execute SQL：" + sql + "\n");
 		if (maxTime >= 1 && timing > maxTime) {
 			throw new MybatisPlusException(" The SQL execution time is too large, please optimize ! ");
 		}
@@ -89,10 +97,10 @@ public class PerformanceInterceptor implements Interceptor {
 		// TODO
 	}
 
-	private String getSql(BoundSql boundSql, Object parameterObject, Configuration configuration) {
-		String sql = boundSql.getSql().replaceAll("[\\s]+", " ");
+	private List<String> getParams(BoundSql boundSql, Object parameterObject, Configuration configuration) {
 		List<ParameterMapping> parameterMappings = boundSql.getParameterMappings();
 		TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
+		List<String> params = new ArrayList<String>();
 		if (parameterMappings != null) {
 			for (int i = 0; i < parameterMappings.size(); i++) {
 				ParameterMapping parameterMapping = parameterMappings.get(i);
@@ -109,38 +117,11 @@ public class PerformanceInterceptor implements Interceptor {
 						MetaObject metaObject = configuration.newMetaObject(parameterObject);
 						value = metaObject.getValue(propertyName);
 					}
-					sql = replacePlaceholder(sql, value);
+					params.add(StringUtils.sqlParam(value));
 				}
 			}
 		}
-		return sql;
-	}
-
-	private String replacePlaceholder(String sql, Object propertyValue) {
-		String result;
-		if (propertyValue != null) {
-			if (propertyValue instanceof String) {
-				result = "'" + propertyValue + "'";
-			} else if (propertyValue instanceof Date) {
-				result = "'" + dateToString(propertyValue) + "'";
-			} else {
-				result = propertyValue.toString();
-			}
-		} else {
-			result = "null";
-		}
-
-		/* 特殊处理 $ 符内容 */
-		if (null != result && result.contains("$")) {
-			return sql.replaceFirst("\\?", "[?]").replace("[?]", result);
-		}
-
-		/* 填充占位符 */
-		return sql.replaceFirst("\\?", result);
-	}
-
-	private synchronized String dateToString(Object obj) {
-		return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(obj);
+		return params;
 	}
 
 	public long getMaxTime() {
@@ -151,4 +132,11 @@ public class PerformanceInterceptor implements Interceptor {
 		this.maxTime = maxTime;
 	}
 
+	public boolean isFormat() {
+		return format;
+	}
+
+	public void setFormat(boolean format) {
+		this.format = format;
+	}
 }

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

@@ -0,0 +1,372 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package com.baomidou.mybatisplus.plugins;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Locale;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+/**
+ * Performs formatting of basic SQL statements (DML + query).
+ * <P>
+ * Copy Hibernate BasicFormatterImpl
+ * </P>
+ * 
+ * @author Gavin King
+ * @author Steve Ebersole
+ */
+public class SQLFormatter {
+
+	private static final Set<String> BEGIN_CLAUSES = new HashSet<String>();
+	private static final Set<String> END_CLAUSES = new HashSet<String>();
+	private static final Set<String> LOGICAL = new HashSet<String>();
+	private static final Set<String> QUANTIFIERS = new HashSet<String>();
+	private static final Set<String> DML = new HashSet<String>();
+	private static final Set<String> MISC = new HashSet<String>();
+	public static final String WHITESPACE = " \n\r\f\t";
+
+	static {
+		BEGIN_CLAUSES.add("left");
+		BEGIN_CLAUSES.add("right");
+		BEGIN_CLAUSES.add("inner");
+		BEGIN_CLAUSES.add("outer");
+		BEGIN_CLAUSES.add("group");
+		BEGIN_CLAUSES.add("order");
+
+		END_CLAUSES.add("where");
+		END_CLAUSES.add("set");
+		END_CLAUSES.add("having");
+		END_CLAUSES.add("join");
+		END_CLAUSES.add("from");
+		END_CLAUSES.add("by");
+		END_CLAUSES.add("join");
+		END_CLAUSES.add("into");
+		END_CLAUSES.add("union");
+
+		LOGICAL.add("and");
+		LOGICAL.add("or");
+		LOGICAL.add("when");
+		LOGICAL.add("else");
+		LOGICAL.add("end");
+
+		QUANTIFIERS.add("in");
+		QUANTIFIERS.add("all");
+		QUANTIFIERS.add("exists");
+		QUANTIFIERS.add("some");
+		QUANTIFIERS.add("any");
+
+		DML.add("insert");
+		DML.add("update");
+		DML.add("delete");
+
+		MISC.add("select");
+		MISC.add("on");
+	}
+
+	private static final String INDENT_STRING = "    ";
+	private static final String INITIAL = "\n    ";
+
+	public String format(String source) {
+		return new FormatProcess(source).perform();
+	}
+
+	private static class FormatProcess {
+		boolean beginLine = true;
+		boolean afterBeginBeforeEnd;
+		boolean afterByOrSetOrFromOrSelect;
+		boolean afterValues;
+		boolean afterOn;
+		boolean afterBetween;
+		boolean afterInsert;
+		int inFunction;
+		int parensSinceSelect;
+		private LinkedList<Integer> parenCounts = new LinkedList<Integer>();
+		private LinkedList<Boolean> afterByOrFromOrSelects = new LinkedList<Boolean>();
+
+		int indent = 1;
+
+		StringBuilder result = new StringBuilder();
+		StringTokenizer tokens;
+		String lastToken;
+		String token;
+		String lcToken;
+
+		public FormatProcess(String sql) {
+			tokens = new StringTokenizer(sql, "()+*/-=<>'`\"[]," + WHITESPACE, true);
+		}
+
+		public String perform() {
+
+			result.append(INITIAL);
+
+			while (tokens.hasMoreTokens()) {
+				token = tokens.nextToken();
+				lcToken = token.toLowerCase(Locale.ROOT);
+
+				if ("'".equals(token)) {
+					String t;
+					do {
+						t = tokens.nextToken();
+						token += t;
+					}
+					// cannot handle single quotes
+					while (!"'".equals(t) && tokens.hasMoreTokens());
+				} else if ("\"".equals(token)) {
+					String t;
+					do {
+						t = tokens.nextToken();
+						token += t;
+					} while (!"\"".equals(t));
+				}
+
+				if (afterByOrSetOrFromOrSelect && ",".equals(token)) {
+					commaAfterByOrFromOrSelect();
+				} else if (afterOn && ",".equals(token)) {
+					commaAfterOn();
+				}
+
+				else if ("(".equals(token)) {
+					openParen();
+				} else if (")".equals(token)) {
+					closeParen();
+				}
+
+				else if (BEGIN_CLAUSES.contains(lcToken)) {
+					beginNewClause();
+				}
+
+				else if (END_CLAUSES.contains(lcToken)) {
+					endNewClause();
+				}
+
+				else if ("select".equals(lcToken)) {
+					select();
+				}
+
+				else if (DML.contains(lcToken)) {
+					updateOrInsertOrDelete();
+				}
+
+				else if ("values".equals(lcToken)) {
+					values();
+				}
+
+				else if ("on".equals(lcToken)) {
+					on();
+				}
+
+				else if (afterBetween && lcToken.equals("and")) {
+					misc();
+					afterBetween = false;
+				}
+
+				else if (LOGICAL.contains(lcToken)) {
+					logical();
+				}
+
+				else if (isWhitespace(token)) {
+					white();
+				}
+
+				else {
+					misc();
+				}
+
+				if (!isWhitespace(token)) {
+					lastToken = lcToken;
+				}
+
+			}
+			return result.toString();
+		}
+
+		private void commaAfterOn() {
+			out();
+			indent--;
+			newline();
+			afterOn = false;
+			afterByOrSetOrFromOrSelect = true;
+		}
+
+		private void commaAfterByOrFromOrSelect() {
+			out();
+			newline();
+		}
+
+		private void logical() {
+			if ("end".equals(lcToken)) {
+				indent--;
+			}
+			newline();
+			out();
+			beginLine = false;
+		}
+
+		private void on() {
+			indent++;
+			afterOn = true;
+			newline();
+			out();
+			beginLine = false;
+		}
+
+		private void misc() {
+			out();
+			if ("between".equals(lcToken)) {
+				afterBetween = true;
+			}
+			if (afterInsert) {
+				newline();
+				afterInsert = false;
+			} else {
+				beginLine = false;
+				if ("case".equals(lcToken)) {
+					indent++;
+				}
+			}
+		}
+
+		private void white() {
+			if (!beginLine) {
+				result.append(" ");
+			}
+		}
+
+		private void updateOrInsertOrDelete() {
+			out();
+			indent++;
+			beginLine = false;
+			if ("update".equals(lcToken)) {
+				newline();
+			}
+			if ("insert".equals(lcToken)) {
+				afterInsert = true;
+			}
+		}
+
+		private void select() {
+			out();
+			indent++;
+			newline();
+			parenCounts.addLast(parensSinceSelect);
+			afterByOrFromOrSelects.addLast(afterByOrSetOrFromOrSelect);
+			parensSinceSelect = 0;
+			afterByOrSetOrFromOrSelect = true;
+		}
+
+		private void out() {
+			result.append(token);
+		}
+
+		private void endNewClause() {
+			if (!afterBeginBeforeEnd) {
+				indent--;
+				if (afterOn) {
+					indent--;
+					afterOn = false;
+				}
+				newline();
+			}
+			out();
+			if (!"union".equals(lcToken)) {
+				indent++;
+			}
+			newline();
+			afterBeginBeforeEnd = false;
+			afterByOrSetOrFromOrSelect = "by".equals(lcToken) || "set".equals(lcToken) || "from".equals(lcToken);
+		}
+
+		private void beginNewClause() {
+			if (!afterBeginBeforeEnd) {
+				if (afterOn) {
+					indent--;
+					afterOn = false;
+				}
+				indent--;
+				newline();
+			}
+			out();
+			beginLine = false;
+			afterBeginBeforeEnd = true;
+		}
+
+		private void values() {
+			indent--;
+			newline();
+			out();
+			indent++;
+			newline();
+			afterValues = true;
+		}
+
+		private void closeParen() {
+			parensSinceSelect--;
+			if (parensSinceSelect < 0) {
+				indent--;
+				parensSinceSelect = parenCounts.removeLast();
+				afterByOrSetOrFromOrSelect = afterByOrFromOrSelects.removeLast();
+			}
+			if (inFunction > 0) {
+				inFunction--;
+				out();
+			} else {
+				if (!afterByOrSetOrFromOrSelect) {
+					indent--;
+					newline();
+				}
+				out();
+			}
+			beginLine = false;
+		}
+
+		private void openParen() {
+			if (isFunctionName(lastToken) || inFunction > 0) {
+				inFunction++;
+			}
+			beginLine = false;
+			if (inFunction > 0) {
+				out();
+			} else {
+				out();
+				if (!afterByOrSetOrFromOrSelect) {
+					indent++;
+					newline();
+					beginLine = true;
+				}
+			}
+			parensSinceSelect++;
+		}
+
+		private static boolean isFunctionName(String tok) {
+			final char begin = tok.charAt(0);
+			final boolean isIdentifier = Character.isJavaIdentifierStart(begin) || '"' == begin;
+			return isIdentifier && !LOGICAL.contains(tok) && !END_CLAUSES.contains(tok) && !QUANTIFIERS.contains(tok)
+					&& !DML.contains(tok) && !MISC.contains(tok);
+		}
+
+		private static boolean isWhitespace(String token) {
+			return WHITESPACE.contains(token);
+		}
+
+		private void newline() {
+			result.append("\n");
+			for (int i = 0; i < indent; i++) {
+				result.append(INDENT_STRING);
+			}
+			beginLine = true;
+		}
+	}
+
+	public static void main(String[] args) {
+		String sql = "select     *          from suber where id = '11  122'";
+        String format = new SQLFormatter().format(sql);
+        System.out.println(format);
+        System.out.println(format.replaceAll("([\\s]+(\"|'')?)", ""));
+	}
+}

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/SqlUtils.java

@@ -15,6 +15,7 @@
  */
 package com.baomidou.mybatisplus.toolkit;
 
+import com.baomidou.mybatisplus.plugins.SQLFormatter;
 import com.baomidou.mybatisplus.plugins.entity.CountOptimize;
 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 
@@ -27,6 +28,7 @@ import com.baomidou.mybatisplus.plugins.pagination.Pagination;
  * @Date 2016-11-13
  */
 public class SqlUtils {
+	private final static SQLFormatter sqlFormatter = new SQLFormatter();
 
 	/**
 	 * 获取CountOptimize
@@ -91,4 +93,18 @@ public class SqlUtils {
 		return originalSql;
 	}
 
+	/**
+	 * 格式sql
+	 * 
+	 * @param boundSql
+	 * @param format
+	 * @return
+	 */
+	public static String sqlFormat(String boundSql, boolean format) {
+		if (format) {
+			return sqlFormatter.format(boundSql);
+		} else {
+			return boundSql.replaceAll("[\\s]+", " ");
+		}
+	}
 }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/StringUtils.java

@@ -172,19 +172,29 @@ public class StringUtils {
 			int length = args.length;
 			if (length >= 1) {
 				for (int i = 0; i < length; i++) {
-					String repStr;
-					if (args[i] instanceof Collection) {
-						repStr = StringUtils.quotaMarkList((Collection<?>) args[i]);
-					} else {
-						repStr = StringUtils.quotaMark(args[i]);
-					}
-					content = content.replace(String.format(PLACE_HOLDER, i), repStr);
+					content = content.replace(String.format(PLACE_HOLDER, i), sqlParam(args[i]));
 				}
 			}
 		}
 		return content;
 	}
 
+	/**
+	 * 获取SQL PARAMS字符串
+	 * 
+	 * @param obj
+	 * @return
+	 */
+	public static String sqlParam(Object obj) {
+		String repStr;
+		if (obj instanceof Collection) {
+			repStr = StringUtils.quotaMarkList((Collection<?>) obj);
+		} else {
+			repStr = StringUtils.quotaMark(obj);
+		}
+		return repStr;
+	}
+
 	/**
 	 * <p>
 	 * 使用单引号包含字符串