浏览代码

jfinal 3.1 release ^_^

James 8 年之前
父节点
当前提交
b3102ce729
共有 2 个文件被更改,包括 4 次插入8 次删除
  1. 1 1
      pom.xml
  2. 3 7
      src/main/java/com/jfinal/plugin/activerecord/sql/ParaDirective.java

+ 1 - 1
pom.xml

@@ -155,7 +155,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.28</version>
 			<scope>provided</scope>
 		</dependency>
 		

+ 3 - 7
src/main/java/com/jfinal/plugin/activerecord/sql/ParaDirective.java

@@ -17,15 +17,10 @@
 package com.jfinal.plugin.activerecord.sql;
 
 import java.io.Writer;
-
 import com.jfinal.plugin.activerecord.SqlPara;
 import com.jfinal.template.Directive;
 import com.jfinal.template.Env;
 import com.jfinal.template.TemplateException;
-import com.jfinal.template.expr.ast.Expr;
-import com.jfinal.template.expr.ast.ExprList;
-import com.jfinal.template.expr.ast.Id;
-import com.jfinal.template.stat.ParseException;
 import com.jfinal.template.stat.Scope;
 
 /**
@@ -46,6 +41,7 @@ import com.jfinal.template.stat.Scope;
  */
 public class ParaDirective extends Directive {
 	
+	/*
 	private Id id;
 	
 	public void setExprList(ExprList exprList) {
@@ -58,7 +54,7 @@ public class ParaDirective extends Directive {
 		}
 		
 		this.id = (Id)exprs[0];
-	}
+	}*/
 	
 	public void exec(Env env, Scope scope, Writer writer) {
 		SqlPara sqlPara = (SqlPara)scope.get(SqlKit.SQL_PARA_KEY);
@@ -67,7 +63,7 @@ public class ParaDirective extends Directive {
 		}
 		
 		write(writer, "?");
-		sqlPara.addPara(id.eval(scope));
+		sqlPara.addPara(exprList.eval(scope));
 	}
 }