Kv.by 改为 Kv.of

src/main/java/com/jfinal/kit/ElKit.java

@@ -32,7 +32,7 @@ import com.jfinal.template.stat.Scope;
  * 	  Integer value = ElKit.eval("1 + 2 * 3");
  * 
  * 2：带参示例
- * 	  Kv data = Kv.by("a", 2).set("b", 3);
+ * 	  Kv data = Kv.of("a", 2).set("b", 3);
  * 	  Integer value = ElKit.eval("1 + a * b", data);
  * </pre>
  */

src/main/java/com/jfinal/kit/Kv.java

@@ -25,7 +25,7 @@ import com.jfinal.json.Json;
  * Kv (Key Value)
  *
  * Example：
- *    Kv para = Kv.by("id", 123);
+ *    Kv para = Kv.of("id", 123);
  *    User user = user.findFirst(getSqlPara("find", para));
  */
 @SuppressWarnings({"rawtypes", "unchecked"})

src/main/java/com/jfinal/plugin/activerecord/Db.java

@@ -778,7 +778,7 @@ public class Db {
 	 * 
 	 * <pre>
 	 * 例子：
-	 * Db.template("blog.find", Kv.by("id", 123).find();
+	 * Db.template("blog.find", Kv.of("id", 123).find();
 	 * </pre>
 	 */
 	public static DbTemplate template(String key, Map data) {
@@ -806,7 +806,7 @@ public class Db {
 	 * <pre>
 	 * 例子：
 	 * String sql = "select * from blog where id = #para(id)";
-	 * Db.templateByString(sql, Kv.by("id", 123).find();
+	 * Db.templateByString(sql, Kv.of("id", 123).find();
 	 * </pre>
 	 */
 	public static DbTemplate templateByString(String content, Map data) {

src/main/java/com/jfinal/plugin/activerecord/Model.java

@@ -1183,7 +1183,7 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	 *
 	 * <pre>
 	 * 例子：
-	 * dao.template("blog.find", Kv.by("id", 123)).find();
+	 * dao.template("blog.find", Kv.of("id", 123)).find();
 	 * </pre>
 	 */
 	public DaoTemplate<M> template(String key, Map data) {
@@ -1215,7 +1215,7 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	 * <pre>
 	 * 例子：
 	 * String sql = "select * from blog where id = #para(id)";
-	 * dao.templateByString(sql, Kv.by("id", 123)).find();
+	 * dao.templateByString(sql, Kv.of("id", 123)).find();
 	 * </pre>
 	 */
 	public DaoTemplate<M> templateByString(String content, Map data) {

src/main/java/com/jfinal/plugin/activerecord/generator/BaseModelGenerator.java

@@ -117,7 +117,7 @@ public class BaseModelGenerator {
 	}
 
 	protected void genBaseModelContent(TableMeta tableMeta) {
-		Kv data = Kv.by("baseModelPackageName", baseModelPackageName);
+		Kv data = Kv.of("baseModelPackageName", baseModelPackageName);
 		data.set("generateChainSetter", generateChainSetter);
 		data.set("tableMeta", tableMeta);
 

src/main/java/com/jfinal/plugin/activerecord/generator/MappingKitGenerator.java

@@ -93,7 +93,7 @@ public class MappingKitGenerator {
 		System.out.println("Generate MappingKit file ...");
 		System.out.println("MappingKit Output Dir: " + mappingKitOutputDir);
 
-		Kv data = Kv.by("mappingKitPackageName", mappingKitPackageName);
+		Kv data = Kv.of("mappingKitPackageName", mappingKitPackageName);
 		data.set("mappingKitClassName", mappingKitClassName);
 		data.set("tableMetas", tableMetas);
 

src/main/java/com/jfinal/plugin/activerecord/generator/ModelGenerator.java

@@ -92,7 +92,7 @@ public class ModelGenerator {
 	}
 
 	protected void genModelContent(TableMeta tableMeta) {
-		Kv data = Kv.by("modelPackageName", modelPackageName);
+		Kv data = Kv.of("modelPackageName", modelPackageName);
 		data.set("baseModelPackageName", baseModelPackageName);
 		data.set("generateDaoInModel", generateDaoInModel);
 		data.set("tableMeta", tableMeta);

src/main/java/com/jfinal/plugin/activerecord/sql/SqlKit.java

@@ -167,7 +167,7 @@ public class SqlKit {
 	 *	#end
 	 *
 	 * 2：java 代码
-	 * 	Kv cond = Kv.by("id", 123).set("age", 18);
+	 * 	Kv cond = Kv.of("id", 123).set("age", 18);
 	 * 	getSqlPara("key", cond);
 	 */
 	public SqlPara getSqlPara(String key, Map data) {
@@ -224,7 +224,7 @@ public class SqlKit {
 	 * <pre>
 	 * 例子：
 	 *     String content = "select * from user where id = #para(id)";
-	 *     SqlPara sqlPara = getSqlParaByString(content, Kv.by("id", 123));
+	 *     SqlPara sqlPara = getSqlParaByString(content, Kv.of("id", 123));
 	 * 
 	 * 特别注意：content 参数中不能包含 #sql 指令
 	 * </pre>

src/main/java/com/jfinal/template/Template.java

@@ -159,7 +159,7 @@ public class Template {
 	 *   String ret = template.renderToString(data, (ast, env, scope, writer) -> {
 	 *      // 可以传入任意类型的 attachment 参数，以下以 Kv 对象为例
 	 *      // 该参数可以在指令中通过 scope.getCtrl().getAttachment() 获取
-	 *      scope.getCtrl().setAttachment(Kv.by("key", 456));
+	 *      scope.getCtrl().setAttachment(Kv.of("key", 456));
 	 *      
 	 *      // 接管内部的 ast、env、scope、writer，执行 ast.exec(...)
 	 *      ast.exec(env, scope, writer);

src/test/java/com/jfinal/template/EngineTest.java

@@ -22,7 +22,7 @@ public class EngineTest {
 	
 	@Test
 	public void renderToString() {
-		Kv para = Kv.by("key", "value");
+		Kv para = Kv.of("key", "value");
 		String result = engine.getTemplateByString("#(key)").renderToString(para);
 		Assert.assertEquals("value", result);
 	}

src/test/java/com/jfinal/template/SwitchTest.java

@@ -24,7 +24,7 @@ public class SwitchTest {
 	@Test
 	public void switch_() {
 		Template template = engine.getTemplate("com/jfinal/template/switch.txt");
-		Kv kv = Kv.by("data", 123).set("b", 123);
+		Kv kv = Kv.of("data", 123).set("b", 123);
 		String ret = template.renderToString(kv);
 		System.out.print(ret);
 	}