Compare commits
No commits in common. "dev" and "enjoy-4.3" have entirely different histories.
48
README.md
48
README.md
@ -8,7 +8,7 @@ Enjoy 是基于 Java 语言的极轻量极魔板引擎。极轻量级仅 227 KB
|
||||
<dependency>
|
||||
<groupId>com.jfinal</groupId>
|
||||
<artifactId>enjoy</artifactId>
|
||||
<version>4.8</version>
|
||||
<version>4.3</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
@ -25,49 +25,7 @@ Enjoy 是基于 Java 语言的极轻量极魔板引擎。极轻量级仅 227 KB
|
||||
|
||||
#### 简单示例：
|
||||
|
||||
**1. 与 Spring boot 整合**
|
||||
```java
|
||||
@Configuration
|
||||
public class SpringBootConfig {
|
||||
|
||||
@Bean(name = "jfinalViewResolver")
|
||||
public JFinalViewResolver getJFinalViewResolver() {
|
||||
|
||||
// 创建用于整合 spring boot 的 ViewResolver 扩展对象
|
||||
JFinalViewResolver jfr = new JFinalViewResolver();
|
||||
|
||||
// 对 spring boot 进行配置
|
||||
jfr.setSuffix(".html");
|
||||
jfr.setContentType("text/html;charset=UTF-8");
|
||||
jfr.setOrder(0);
|
||||
|
||||
// 获取 engine 对象，对 enjoy 模板引擎进行配置，配置方式与前面章节完全一样
|
||||
Engine engine = JFinalViewResolver.engine;
|
||||
|
||||
// 热加载配置能对后续配置产生影响，需要放在最前面
|
||||
engine.setDevMode(true);
|
||||
|
||||
// 使用 ClassPathSourceFactory 从 class path 与 jar 包中加载模板文件
|
||||
engine.setToClassPathSourceFactory();
|
||||
|
||||
// 在使用 ClassPathSourceFactory 时要使用 setBaseTemplatePath
|
||||
// 代替 jfr.setPrefix("/view/")
|
||||
engine.setBaseTemplatePath("/view/");
|
||||
|
||||
// 添加模板函数
|
||||
engine.addSharedFunction("/common/_layout.html");
|
||||
engine.addSharedFunction("/common/_paginate.html");
|
||||
|
||||
// 更多配置与前面章节完全一样
|
||||
// engine.addDirective(...)
|
||||
// engine.addSharedMethod(...);
|
||||
|
||||
return jfr;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**2. 与 Spring MVC 整合**
|
||||
**1. 在 spring 中的配置**
|
||||
|
||||
```java
|
||||
<bean id="viewResolver" class="com.jfinal.template.ext.spring.JFinalViewResolver">
|
||||
@ -85,7 +43,7 @@ public class SpringBootConfig {
|
||||
</bean>
|
||||
```
|
||||
|
||||
**3.详细使用方法见官方文档**
|
||||
**2.详细使用方法见 jfinal 手册**
|
||||
|
||||
read me 正在补充，详细使用文档见官网：[https://www.jfinal.com/doc/6-1](https://www.jfinal.com/doc/6-1)
|
||||
|
||||
|
||||
69
pom.xml
69
pom.xml
@ -1,16 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.jfinal</groupId>
|
||||
<artifactId>enjoy</artifactId>
|
||||
<version>4.8.dev</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
|
||||
<name>enjoy</name>
|
||||
<description>Enjoy is a simple, light, rapid, independent, extensible Java Template Engine.</description>
|
||||
<version>4.3</version>
|
||||
<url>http://www.jfinal.com</url>
|
||||
<description>Enjoy is a simple, light, rapid, independent, extensible Java Template Engine.</description>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
@ -21,15 +17,13 @@
|
||||
<system>Git Issue</system>
|
||||
<url>https://gitee.com/jfinal/enjoy/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The Apache Software License, Version 2.0</name>
|
||||
<url>http://apache.org/licenses/LICENSE-2.0.txt</url>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<!--<developers>
|
||||
<developers>
|
||||
<developer>
|
||||
<id>jfinal</id>
|
||||
<name>James</name>
|
||||
@ -37,29 +31,25 @@
|
||||
<url>http://jfinal.com/user/1</url>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:git@gitee.com:jfinal/enjoy.git</connection>
|
||||
<developerConnection>scm:git:git@gitee.com:jfinal/enjoy.git</developerConnection>
|
||||
<url>git@gitee.com:jfinal/enjoy.git</url>
|
||||
</scm>-->
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>mvn-release</id>
|
||||
<name>mvn-release</name>
|
||||
<url>https://nexus.1216.top/repository/maven-releases/</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
</scm>
|
||||
|
||||
<parent>
|
||||
<groupId>org.sonatype.oss</groupId>
|
||||
<artifactId>oss-parent</artifactId>
|
||||
<version>7</version>
|
||||
</parent>
|
||||
|
||||
<repositories>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.13.1</version>
|
||||
<version>4.8.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -77,7 +67,6 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<defaultGoal>compile</defaultGoal>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@ -86,27 +75,20 @@
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.4</version>
|
||||
<version>2.10.3</version>
|
||||
<configuration>
|
||||
<!-- 解决 java8 发布到 maven 异常 -->
|
||||
<additionalparam>-Xdoclint:none</additionalparam>
|
||||
<encoding>UTF-8</encoding>
|
||||
<outputDirectory>${basedir}</outputDirectory>
|
||||
<reportOutputDirectory>${basedir}</reportOutputDirectory>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- 安装源码到本地仓库 -->
|
||||
@ -125,20 +107,23 @@
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--<plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>1.6</version>
|
||||
<version>1.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>-->
|
||||
<configuration>
|
||||
<skip>false</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
@ -102,10 +102,6 @@ public class StrKit {
|
||||
return true;
|
||||
}
|
||||
|
||||
public static String defaultIfBlank(String str, String defaultValue) {
|
||||
return isBlank(str) ? defaultValue : str;
|
||||
}
|
||||
|
||||
public static String toCamelCase(String stringWithUnderline) {
|
||||
if (stringWithUnderline.indexOf('_') == -1) {
|
||||
return stringWithUnderline;
|
||||
@ -149,17 +145,6 @@ public class StrKit {
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
public static String join(java.util.List<String> list, String separator) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (int i=0, len=list.size(); i<len; i++) {
|
||||
if (i > 0) {
|
||||
sb.append(separator);
|
||||
}
|
||||
sb.append(list.get(i));
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
public static boolean slowEquals(String a, String b) {
|
||||
byte[] aBytes = (a != null ? a.getBytes() : null);
|
||||
byte[] bBytes = (b != null ? b.getBytes() : null);
|
||||
|
||||
@ -1,215 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
|
||||
* <p>
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
* <p>
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* <p>
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.jfinal.kit;
|
||||
|
||||
|
||||
import com.jfinal.kit.tpl.NameSpaceDirective;
|
||||
import com.jfinal.kit.tpl.ParaDirective;
|
||||
import com.jfinal.kit.tpl.TplDirective;
|
||||
import com.jfinal.kit.tpl.TplSource;
|
||||
import com.jfinal.template.Engine;
|
||||
import com.jfinal.template.Template;
|
||||
import com.jfinal.template.source.FileSource;
|
||||
import com.jfinal.template.source.ISource;
|
||||
import com.jfinal.template.stat.Location;
|
||||
import com.jfinal.template.stat.ParseException;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileFilter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
/**
|
||||
* SqlKit
|
||||
*/
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
public class TplKit {
|
||||
public static String baseSqlTemplatePath;
|
||||
public static final String SQL_TEMPLATE_MAP_KEY = "_SQL_TEMPLATE_MAP_";
|
||||
public static final String SQL_PARA_KEY = "_SQL_PARA_";
|
||||
public static final String PARA_ARRAY_KEY = "_PARA_ARRAY_"; // 此参数保持不动，已被用于模板取值 _PARA_ARRAY_[n]
|
||||
|
||||
private String configName;
|
||||
private boolean devMode;
|
||||
private Engine engine;
|
||||
private List<TplSource> tplSourceList = new ArrayList<TplSource>();
|
||||
private Map<String, Template> sqlTemplateMap;
|
||||
|
||||
private static Map<String, TplKit> kitMap = new HashMap<>();
|
||||
|
||||
public static TplKit use(String configName) {
|
||||
return use(configName, false);
|
||||
}
|
||||
|
||||
public static synchronized TplKit use(String configName, boolean devMode) {
|
||||
TplKit tplKit = kitMap.get(configName);
|
||||
if (tplKit == null) {
|
||||
tplKit = new TplKit(configName, devMode);
|
||||
kitMap.put(configName, tplKit);
|
||||
}
|
||||
return tplKit;
|
||||
}
|
||||
|
||||
private TplKit(String configName, boolean devMode) {
|
||||
this.configName = configName;
|
||||
this.devMode = devMode;
|
||||
|
||||
engine = new Engine(configName);
|
||||
engine.setDevMode(devMode);
|
||||
engine.setToClassPathSourceFactory();
|
||||
|
||||
engine.addDirective("namespace", NameSpaceDirective.class);
|
||||
engine.addDirective("tpl", TplDirective.class);
|
||||
|
||||
engine.addDirective("para", ParaDirective.class, true);
|
||||
engine.addDirective("p", ParaDirective.class, true); // 配置 #para 指令的别名指令 #p，不建议使用，在此仅为兼容 3.0 版本
|
||||
}
|
||||
|
||||
private TplKit(String configName) {
|
||||
this(configName, false);
|
||||
}
|
||||
|
||||
public Engine getEngine() {
|
||||
return engine;
|
||||
}
|
||||
|
||||
public void setDevMode(boolean devMode) {
|
||||
this.devMode = devMode;
|
||||
engine.setDevMode(devMode);
|
||||
}
|
||||
|
||||
public void setBaseTplTemplatePath(String baseSqlTemplatePath) {
|
||||
this.baseSqlTemplatePath = baseSqlTemplatePath;
|
||||
}
|
||||
|
||||
public void addTplTemplate(String sqlTemplate) {
|
||||
if (StrKit.isBlank(sqlTemplate)) {
|
||||
throw new IllegalArgumentException("tplTemplate can not be blank");
|
||||
}
|
||||
if (baseSqlTemplatePath != null) {
|
||||
addTplTemplate(new FileSource(baseSqlTemplatePath, "tpl.sql"));
|
||||
} else {
|
||||
tplSourceList.add(new TplSource(sqlTemplate));
|
||||
}
|
||||
}
|
||||
|
||||
public void addTplTemplate(ISource sqlTemplate) {
|
||||
if (sqlTemplate == null) {
|
||||
throw new IllegalArgumentException("sqlTemplate can not be null");
|
||||
}
|
||||
tplSourceList.add(new TplSource(sqlTemplate));
|
||||
}
|
||||
|
||||
public void addTplTemplate(File file) {
|
||||
addTplTemplate(file, null);
|
||||
}
|
||||
|
||||
public void addTplTemplate(File file, FileFilter filter) {
|
||||
if (file.isFile()) {
|
||||
if (filter != null && !filter.accept(file)) {
|
||||
return;
|
||||
}
|
||||
addTplTemplate(new FileSource(file.getParent(), file.getName()));
|
||||
} else if (file.isDirectory()) {
|
||||
File[] files = file.listFiles();
|
||||
for (File file1 : files) {
|
||||
addTplTemplate(file1, filter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public synchronized void parseTplTemplate() {
|
||||
Map<String, Template> sqlTemplateMap = new HashMap<String, Template>(512, 0.5F);
|
||||
for (TplSource ss : tplSourceList) {
|
||||
String fileName = ss.isFile() ? ss.file : ((FileSource) ss.source).getFinalFileName();
|
||||
try {
|
||||
Template template = ss.isFile() ? engine.getTemplate(ss.file) : engine.getTemplate(ss.source);
|
||||
Map<Object, Object> data = new HashMap<>();
|
||||
data.put(SQL_TEMPLATE_MAP_KEY, sqlTemplateMap);
|
||||
template.renderToString(data);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(String.format("%s parse error", fileName), e);
|
||||
}
|
||||
}
|
||||
this.sqlTemplateMap = sqlTemplateMap;
|
||||
}
|
||||
|
||||
private void reloadModifiedTplTemplate() {
|
||||
engine.removeAllTemplateCache(); // 去除 Engine 中的缓存，以免 get 出来后重新判断 isModified
|
||||
parseTplTemplate();
|
||||
}
|
||||
|
||||
private boolean isTplTemplateModified() {
|
||||
for (Template template : sqlTemplateMap.values()) {
|
||||
if (template.isModified()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private Template getTplTemplate(String key) {
|
||||
Template template = sqlTemplateMap.get(key);
|
||||
if (template == null) { // 此 if 分支，处理起初没有定义，但后续不断追加 sql 的情况
|
||||
if (!devMode) {
|
||||
return null;
|
||||
}
|
||||
if (isTplTemplateModified()) {
|
||||
synchronized (this) {
|
||||
if (isTplTemplateModified()) {
|
||||
reloadModifiedTplTemplate();
|
||||
template = sqlTemplateMap.get(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
return template;
|
||||
}
|
||||
|
||||
if (devMode && template.isModified()) {
|
||||
synchronized (this) {
|
||||
template = sqlTemplateMap.get(key);
|
||||
if (template.isModified()) {
|
||||
reloadModifiedTplTemplate();
|
||||
template = sqlTemplateMap.get(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
return template;
|
||||
}
|
||||
|
||||
public String getTpl(String key) {
|
||||
Template template = getTplTemplate(key);
|
||||
return template != null ? template.renderToString(null).replaceAll("[\\s]+", " ") : null;
|
||||
}
|
||||
|
||||
public String getTpl(String key, Map para) {
|
||||
Template template = getTplTemplate(key);
|
||||
return template != null ? template.renderToString(para).replaceAll("[\\s]+", " ") : null;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return "SqlKit for config : " + configName;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.jfinal.kit.tpl;
|
||||
|
||||
import com.jfinal.template.Directive;
|
||||
import com.jfinal.template.Env;
|
||||
import com.jfinal.template.TemplateException;
|
||||
import com.jfinal.template.expr.ast.Const;
|
||||
import com.jfinal.template.expr.ast.Expr;
|
||||
import com.jfinal.template.expr.ast.ExprList;
|
||||
import com.jfinal.template.io.Writer;
|
||||
import com.jfinal.template.stat.ParseException;
|
||||
import com.jfinal.template.stat.Scope;
|
||||
|
||||
/**
|
||||
* NameSpaceDirective
|
||||
*/
|
||||
public class NameSpaceDirective extends Directive {
|
||||
|
||||
static final String NAME_SPACE_KEY = "_NAME_SPACE_";
|
||||
|
||||
private String nameSpace;
|
||||
|
||||
public void setExprList(ExprList exprList) {
|
||||
if (exprList.length() == 0) {
|
||||
throw new ParseException("The parameter of #namespace directive can not be blank", location);
|
||||
}
|
||||
if (exprList.length() > 1) {
|
||||
throw new ParseException("Only one parameter allowed for #namespace directive", location);
|
||||
}
|
||||
Expr expr = exprList.getExpr(0);
|
||||
if (expr instanceof Const && ((Const)expr).isStr()) {
|
||||
} else {
|
||||
throw new ParseException("The parameter of #namespace directive must be String", location);
|
||||
}
|
||||
|
||||
this.nameSpace = ((Const)expr).getStr();
|
||||
}
|
||||
|
||||
public void exec(Env env, Scope scope, Writer writer) {
|
||||
if (scope.get(NAME_SPACE_KEY) != null) {
|
||||
throw new TemplateException("#namespace directive can not be nested", location);
|
||||
}
|
||||
scope.set(NAME_SPACE_KEY, nameSpace);
|
||||
try {
|
||||
stat.exec(env, scope, writer);
|
||||
} finally {
|
||||
scope.remove(NAME_SPACE_KEY);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean hasEnd() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,127 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.jfinal.kit.tpl;
|
||||
|
||||
import com.jfinal.kit.TplKit;
|
||||
import com.jfinal.template.Directive;
|
||||
import com.jfinal.template.Env;
|
||||
import com.jfinal.template.TemplateException;
|
||||
import com.jfinal.template.expr.ast.Const;
|
||||
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.io.Writer;
|
||||
import com.jfinal.template.stat.ParseException;
|
||||
import com.jfinal.template.stat.Scope;
|
||||
|
||||
/**
|
||||
* #para 指令用于在 sql 模板中根据参数名生成问号占位以及查询参数
|
||||
*
|
||||
* <pre>
|
||||
* 一、参数为表达式的用法
|
||||
* 1：模板内容
|
||||
* #sql("find")
|
||||
* select * from user where nickName = #para(nickName) and age > #para(age)
|
||||
* #end
|
||||
*
|
||||
* 2： java 代码
|
||||
* SqlPara sp = getSqlPara("find", Kv.by("nickName", "prettyGirl").set("age", 18));
|
||||
* user.find(sp)
|
||||
* 或者：
|
||||
* user.find(sp.getSql(), sp.getPara());
|
||||
*
|
||||
* 3：以上用法会在 #para(expr) 处生成问号占位字符，并且实际的参数放入 SqlPara 对象的参数列表中
|
||||
* 后续可以通过 sqlPara.getPara() 获取到参数并直接用于查询
|
||||
*
|
||||
*
|
||||
* 二、参数为 int 型数字的用法
|
||||
* 1：模板内容
|
||||
* #sql("find")
|
||||
* select * from user where id > #para(0) and id < #para(1)
|
||||
* #end
|
||||
*
|
||||
* 2： java 代码
|
||||
* SqlPara sp = getSqlPara("find", 10, 100);
|
||||
* user.find(sp)
|
||||
*
|
||||
* 3：以上用法会在 #para(0) 与 #para(1) 处生成问号占位字符，并且将 10、100 这两个参数放入
|
||||
* SqlPara 对象的参数列表中，后续可以通过 sqlPara.getPara() 获取到参数并直接用于查询
|
||||
* </pre>
|
||||
*/
|
||||
public class ParaDirective extends Directive {
|
||||
|
||||
private int index = -1;
|
||||
private String paraName = null;
|
||||
private static boolean checkParaAssigned = true;
|
||||
|
||||
public static void setCheckParaAssigned(boolean checkParaAssigned) {
|
||||
ParaDirective.checkParaAssigned = checkParaAssigned;
|
||||
}
|
||||
|
||||
public void setExprList(ExprList exprList) {
|
||||
if (exprList.length() == 0) {
|
||||
throw new ParseException("The parameter of #para directive can not be blank", location);
|
||||
}
|
||||
|
||||
if (exprList.length() == 1) {
|
||||
Expr expr = exprList.getExpr(0);
|
||||
if (expr instanceof Const && ((Const)expr).isInt()) {
|
||||
index = ((Const)expr).getInt();
|
||||
if (index < 0) {
|
||||
throw new ParseException("The index of para array must greater than -1", location);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (checkParaAssigned && exprList.getLastExpr() instanceof Id) {
|
||||
Id id = (Id)exprList.getLastExpr();
|
||||
paraName = id.getId();
|
||||
}
|
||||
|
||||
this.exprList = exprList;
|
||||
}
|
||||
|
||||
public void exec(Env env, Scope scope, Writer writer) {
|
||||
TplPara tplPara = (TplPara)scope.get(TplKit.SQL_PARA_KEY);
|
||||
if (tplPara == null) {
|
||||
throw new TemplateException("#para directive invoked by getSqlPara(...) method only", location);
|
||||
}
|
||||
|
||||
write(writer, "?");
|
||||
if (index == -1) {
|
||||
// #para(paraName) 中的 paraName 没有赋值时抛出异常
|
||||
// issue: http://www.jfinal.com/feedback/1832
|
||||
if (checkParaAssigned && paraName != null && !scope.exists(paraName)) {
|
||||
throw new TemplateException("The parameter \""+ paraName +"\" must be assigned", location);
|
||||
}
|
||||
|
||||
tplPara.addPara(exprList.eval(scope));
|
||||
} else {
|
||||
Object[] paras = (Object[])scope.get(TplKit.PARA_ARRAY_KEY);
|
||||
if (paras == null) {
|
||||
throw new TemplateException("The #para(" + index + ") directive must invoked by getSqlPara(String, Object...) method", location);
|
||||
}
|
||||
if (index >= paras.length) {
|
||||
throw new TemplateException("The index of #para directive is out of bounds: " + index, location);
|
||||
}
|
||||
tplPara.addPara(paras[index]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.jfinal.kit.tpl;
|
||||
|
||||
import com.jfinal.kit.StrKit;
|
||||
import com.jfinal.kit.TplKit;
|
||||
import com.jfinal.template.Directive;
|
||||
import com.jfinal.template.Env;
|
||||
import com.jfinal.template.Template;
|
||||
import com.jfinal.template.expr.ast.Const;
|
||||
import com.jfinal.template.expr.ast.Expr;
|
||||
import com.jfinal.template.expr.ast.ExprList;
|
||||
import com.jfinal.template.io.Writer;
|
||||
import com.jfinal.template.stat.ParseException;
|
||||
import com.jfinal.template.stat.Scope;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* SqlDirective
|
||||
*/
|
||||
public class TplDirective extends Directive {
|
||||
|
||||
private String id;
|
||||
|
||||
public void setExprList(ExprList exprList) {
|
||||
if (exprList.length() == 0) {
|
||||
throw new ParseException("The parameter of #sql directive can not be blank", location);
|
||||
}
|
||||
if (exprList.length() > 1) {
|
||||
throw new ParseException("Only one parameter allowed for #sql directive", location);
|
||||
}
|
||||
Expr expr = exprList.getExpr(0);
|
||||
if (expr instanceof Const && ((Const)expr).isStr()) {
|
||||
} else {
|
||||
throw new ParseException("The parameter of #sql directive must be String", location);
|
||||
}
|
||||
|
||||
this.id = ((Const)expr).getStr();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public void exec(Env env, Scope scope, Writer writer) {
|
||||
String nameSpace = (String)scope.get(NameSpaceDirective.NAME_SPACE_KEY);
|
||||
String key = StrKit.isBlank(nameSpace) ? id : nameSpace + "." + id;
|
||||
Map<String, Template> sqlTemplateMap = (Map<String, Template>)scope.get(TplKit.SQL_TEMPLATE_MAP_KEY);
|
||||
if (sqlTemplateMap.containsKey(key)) {
|
||||
throw new ParseException("Sql already exists with key : " + key, location);
|
||||
}
|
||||
|
||||
sqlTemplateMap.put(key, new Template(env, stat));
|
||||
}
|
||||
|
||||
public boolean hasEnd() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.jfinal.kit.tpl;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* SqlPara
|
||||
* 封装查询使用的 sql 与参数，主要用于 getSqlPara(...) 返回值
|
||||
*/
|
||||
public class TplPara implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -8586448059592782381L;
|
||||
|
||||
String sql;
|
||||
List<Object> paraList;
|
||||
|
||||
public TplPara setSql(String sql) {
|
||||
this.sql = sql;
|
||||
return this;
|
||||
}
|
||||
|
||||
public TplPara addPara(Object para) {
|
||||
if (paraList == null) {
|
||||
paraList = new ArrayList<Object>();
|
||||
}
|
||||
paraList.add(para);
|
||||
return this;
|
||||
}
|
||||
|
||||
public String getSql() {
|
||||
return sql;
|
||||
}
|
||||
|
||||
public Object[] getPara() {
|
||||
/*if (paraList == null || paraList.size() == 0) {
|
||||
return DbKit.NULL_PARA_ARRAY;
|
||||
} else {
|
||||
return paraList.toArray(new Object[paraList.size()]);
|
||||
}*/
|
||||
return null;
|
||||
}
|
||||
|
||||
public TplPara clear() {
|
||||
sql = null;
|
||||
if (paraList != null) {
|
||||
paraList.clear();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return "Sql: " + sql + "\nPara: " + paraList;
|
||||
}
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
package com.jfinal.kit.tpl;
|
||||
|
||||
import com.jfinal.template.source.ISource;
|
||||
|
||||
/**
|
||||
* 封装 sql 模板源
|
||||
*/
|
||||
public class TplSource {
|
||||
|
||||
public String file;
|
||||
public ISource source;
|
||||
|
||||
public TplSource(String file) {
|
||||
this.file = file;
|
||||
this.source = null;
|
||||
}
|
||||
|
||||
public TplSource(ISource source) {
|
||||
this.file = null;
|
||||
this.source = source;
|
||||
}
|
||||
|
||||
public boolean isFile() {
|
||||
return file != null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -128,8 +128,7 @@ public class ProxyCompiler {
|
||||
public void compile(ProxyClass proxyClass) {
|
||||
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
|
||||
if (compiler == null) {
|
||||
throw new RuntimeException("Can not get javax.tools.JavaCompiler, check whether \"tools.jar\" is in the environment variable CLASSPATH \n" +
|
||||
"Visit https://jfinal.com/doc/4-8 for details \n");
|
||||
throw new RuntimeException("Can not get javax.tools.JavaCompiler, check whether \"tools.jar\" is in the environment variable CLASSPATH");
|
||||
}
|
||||
|
||||
DiagnosticCollector<JavaFileObject> collector = new DiagnosticCollector<>();
|
||||
|
||||
@ -293,33 +293,25 @@ public class Engine {
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加自定义指令
|
||||
*
|
||||
* 建议添加自定义指令时明确指定 keepLineBlank 变量值，其规则如下：
|
||||
* 1：keepLineBlank 为 true 时， 该指令所在行的前后空白字符以及末尾字符 '\n' 将会被保留
|
||||
* 一般用于具有输出值的指令，例如 #date、#para 等指令
|
||||
*
|
||||
* 2：keepLineBlank 为 false 时，该指令所在行的前后空白字符以及末尾字符 '\n' 将会被删除
|
||||
* 一般用于没有输出值的指令，例如 #for、#if、#else、#end 这种性质的指令
|
||||
*
|
||||
* Add directive
|
||||
* <pre>
|
||||
* 示例：
|
||||
* addDirective("now", NowDirective.class, true)
|
||||
* 示例：
|
||||
* addDirective("now", NowDirective.class)
|
||||
* </pre>
|
||||
*/
|
||||
public Engine addDirective(String directiveName, Class<? extends Directive> directiveClass, boolean keepLineBlank) {
|
||||
config.addDirective(directiveName, directiveClass, keepLineBlank);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加自定义指令，keepLineBlank 使用默认值
|
||||
*/
|
||||
public Engine addDirective(String directiveName, Class<? extends Directive> directiveClass) {
|
||||
config.addDirective(directiveName, directiveClass);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 该方法已被 addDirective(String, Class<? extends Directive>) 所代替
|
||||
*/
|
||||
@Deprecated
|
||||
public Engine addDirective(String directiveName, Directive directive) {
|
||||
return addDirective(directiveName, directive.getClass());
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove directive
|
||||
*/
|
||||
@ -486,24 +478,16 @@ public class Engine {
|
||||
}
|
||||
|
||||
/**
|
||||
* Enjoy 模板引擎对 UTF-8 的 encoding 做过性能优化，某些罕见字符
|
||||
* 无法被编码，可以配置为 JdkEncoderFactory 解决问题:
|
||||
* engine.setEncoderFactory(new JdkEncoderFactory());
|
||||
* Enjoy 模板引擎对 UTF-8 的 encoding 做过性能优化，某些偏门字符在
|
||||
* 被编码为 UTF-8 时会出现异常，此时可以通过继承扩展 EncoderFactory
|
||||
* 来解决编码异常，具体用法参考：
|
||||
* http://www.jfinal.com/feedback/5340
|
||||
*/
|
||||
public Engine setEncoderFactory(EncoderFactory encoderFactory) {
|
||||
config.setEncoderFactory(encoderFactory);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置为 JdkEncoderFactory，支持 utf8mb4，支持 emoji 表情字符，
|
||||
* 支持各种罕见字符编码
|
||||
*/
|
||||
public Engine setToJdkEncoderFactory() {
|
||||
config.setEncoderFactory(new com.jfinal.template.io.JdkEncoderFactory());
|
||||
return this;
|
||||
}
|
||||
|
||||
public Engine setWriterBufferSize(int bufferSize) {
|
||||
config.setWriterBufferSize(bufferSize);
|
||||
return this;
|
||||
|
||||
@ -19,11 +19,9 @@ package com.jfinal.template;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
import com.jfinal.kit.StrKit;
|
||||
import com.jfinal.template.expr.ast.ExprList;
|
||||
import com.jfinal.template.expr.ast.SharedMethodKit;
|
||||
@ -61,9 +59,6 @@ public class EngineConfig {
|
||||
private Map<String, Class<? extends Directive>> directiveMap = new HashMap<String, Class<? extends Directive>>(64, 0.5F);
|
||||
private SharedMethodKit sharedMethodKit = new SharedMethodKit();
|
||||
|
||||
// 保留指令所在行空白字符的指令
|
||||
private Set<String> keepLineBlankDirectives = new HashSet<>();
|
||||
|
||||
private boolean devMode = false;
|
||||
private boolean reloadModifiedSharedFunctionInDevMode = true;
|
||||
private String baseTemplatePath = null;
|
||||
@ -71,19 +66,14 @@ public class EngineConfig {
|
||||
private String datePattern = "yyyy-MM-dd HH:mm";
|
||||
|
||||
public EngineConfig() {
|
||||
// 内置指令 #() 与 #include() 需要配置，保留指令所在行前后空白字符以及行尾换行字符 '\n'
|
||||
setKeepLineBlank("output", true);
|
||||
setKeepLineBlank("include", true);
|
||||
|
||||
// Add official directive of Template Engine
|
||||
addDirective("render", RenderDirective.class, true);
|
||||
addDirective("date", DateDirective.class, true);
|
||||
addDirective("escape", EscapeDirective.class, true);
|
||||
addDirective("random", RandomDirective.class, true);
|
||||
addDirective("number", NumberDirective.class, true);
|
||||
|
||||
addDirective("call", CallDirective.class, false);
|
||||
addDirective("string", StringDirective.class, false);
|
||||
addDirective("render", RenderDirective.class);
|
||||
addDirective("date", DateDirective.class);
|
||||
addDirective("escape", EscapeDirective.class);
|
||||
addDirective("string", StringDirective.class);
|
||||
addDirective("random", RandomDirective.class);
|
||||
addDirective("number", NumberDirective.class);
|
||||
addDirective("call", CallDirective.class);
|
||||
|
||||
// Add official shared method of Template Engine
|
||||
addSharedMethod(new SharedMethodLib());
|
||||
@ -328,7 +318,12 @@ public class EngineConfig {
|
||||
this.reloadModifiedSharedFunctionInDevMode = reloadModifiedSharedFunctionInDevMode;
|
||||
}
|
||||
|
||||
public synchronized void addDirective(String directiveName, Class<? extends Directive> directiveClass, boolean keepLineBlank) {
|
||||
@Deprecated
|
||||
public void addDirective(String directiveName, Directive directive) {
|
||||
addDirective(directiveName, directive.getClass());
|
||||
}
|
||||
|
||||
public synchronized void addDirective(String directiveName, Class<? extends Directive> directiveClass) {
|
||||
if (StrKit.isBlank(directiveName)) {
|
||||
throw new IllegalArgumentException("directive name can not be blank");
|
||||
}
|
||||
@ -338,15 +333,7 @@ public class EngineConfig {
|
||||
if (directiveMap.containsKey(directiveName)) {
|
||||
throw new IllegalArgumentException("directive already exists : " + directiveName);
|
||||
}
|
||||
|
||||
directiveMap.put(directiveName, directiveClass);
|
||||
if (keepLineBlank) {
|
||||
keepLineBlankDirectives.add(directiveName);
|
||||
}
|
||||
}
|
||||
|
||||
public void addDirective(String directiveName, Class<? extends Directive> directiveClass) {
|
||||
addDirective(directiveName, directiveClass, false);
|
||||
}
|
||||
|
||||
public Class<? extends Directive> getDirective(String directiveName) {
|
||||
@ -355,19 +342,6 @@ public class EngineConfig {
|
||||
|
||||
public void removeDirective(String directiveName) {
|
||||
directiveMap.remove(directiveName);
|
||||
keepLineBlankDirectives.remove(directiveName);
|
||||
}
|
||||
|
||||
public void setKeepLineBlank(String directiveName, boolean keepLineBlank) {
|
||||
if (keepLineBlank) {
|
||||
keepLineBlankDirectives.add(directiveName);
|
||||
} else {
|
||||
keepLineBlankDirectives.remove(directiveName);
|
||||
}
|
||||
}
|
||||
|
||||
public Set<String> getKeepLineBlankDirectives() {
|
||||
return keepLineBlankDirectives;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -102,14 +102,6 @@ public class Template {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 支持无 data 参数，渲染到 String 中去 <br>
|
||||
* 适用于数据在模板中通过表达式和语句直接计算得出等等应用场景
|
||||
*/
|
||||
public String renderToString() {
|
||||
return renderToString(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 渲染到 StringBuilder 中去
|
||||
*/
|
||||
|
||||
@ -16,6 +16,10 @@
|
||||
|
||||
package com.jfinal.template.expr.ast;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import com.jfinal.template.TemplateException;
|
||||
import com.jfinal.template.expr.Sym;
|
||||
import com.jfinal.template.stat.Location;
|
||||
@ -33,6 +37,16 @@ public class Logic extends Expr {
|
||||
private Expr left; // ! 运算没有 left 参数
|
||||
private Expr right;
|
||||
|
||||
// 默认为新工作模式
|
||||
private static boolean newWorkMode = true;
|
||||
/**
|
||||
* 设置为旧工作模式，为了兼容 jfinal 3.3 之前的版本
|
||||
*/
|
||||
@Deprecated
|
||||
public static void setToOldWorkMode() {
|
||||
newWorkMode = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构造 || && 结点
|
||||
*/
|
||||
@ -93,6 +107,12 @@ public class Logic extends Expr {
|
||||
* 2：boolean 类型，原值返回
|
||||
* 3：String、StringBuilder 等一切继承自 CharSequence 类的对象，返回 length > 0
|
||||
* 4：其它返回 true
|
||||
*
|
||||
* 通过 Logic.setToOldWorkMode() 设置，可支持老版本中的以下四个规则：
|
||||
* 1：Number 类型，返回 value != 0
|
||||
* 2：Map、Collection(List被包括在内) 返回 size() > 0
|
||||
* 3：数组，返回 length > 0
|
||||
* 4：Iterator 返回 hasNext() 值
|
||||
*/
|
||||
public static boolean isTrue(Object v) {
|
||||
if (v == null) {
|
||||
@ -102,11 +122,38 @@ public class Logic extends Expr {
|
||||
if (v instanceof Boolean) {
|
||||
return (Boolean)v;
|
||||
}
|
||||
|
||||
if (v instanceof CharSequence) {
|
||||
return ((CharSequence)v).length() > 0;
|
||||
}
|
||||
|
||||
// 如果不是新工作模式，则对下面类型进行判断
|
||||
if ( !newWorkMode ) {
|
||||
if (v instanceof Number) {
|
||||
if (v instanceof Double) {
|
||||
return ((Number)v).doubleValue() != 0;
|
||||
}
|
||||
if (v instanceof Float) {
|
||||
return ((Number)v).floatValue() != 0;
|
||||
}
|
||||
return ((Number)v).intValue() != 0;
|
||||
}
|
||||
|
||||
// 下面四种类型的判断已提供了 shared method 扩展，用法如下：
|
||||
// #if(notEmpty(object)) 以及 #if(isEmpty(object))
|
||||
if (v instanceof Collection) {
|
||||
return ((Collection<?>)v).size() > 0;
|
||||
}
|
||||
if (v instanceof Map) {
|
||||
return ((Map<?, ?>)v).size() > 0;
|
||||
}
|
||||
if (v.getClass().isArray()) {
|
||||
return Array.getLength(v) > 0;
|
||||
}
|
||||
if (v instanceof Iterator) {
|
||||
return ((Iterator<?>)v).hasNext();
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ public class Method extends Expr {
|
||||
try {
|
||||
|
||||
MethodInfo methodInfo = MethodKit.getMethod(target.getClass(), methodName, argValues);
|
||||
if (methodInfo.notNull()) {
|
||||
if (methodInfo != null) {
|
||||
return methodInfo.invoke(target, argValues);
|
||||
}
|
||||
|
||||
|
||||
@ -93,29 +93,6 @@ public class MethodInfo {
|
||||
}
|
||||
return ret.append(")").toString();
|
||||
}
|
||||
|
||||
// --------- 以下代码仅用于支持 NullMethodInfo
|
||||
|
||||
/**
|
||||
* 仅供 NullMethodInfo 继承使用
|
||||
*/
|
||||
protected MethodInfo() {
|
||||
this.key = null;
|
||||
this.clazz = null;
|
||||
this.method = null;
|
||||
this.isVarArgs = false;
|
||||
this.paraTypes = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 仅仅 NullMethodInfo 会覆盖此方法并返回 false
|
||||
*
|
||||
* 1：MethodKit.getMethod(...) 消除 instanceof 判断
|
||||
* 2：Method.exec(...) 消除 null 值判断
|
||||
*/
|
||||
public boolean notNull() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ public class MethodKit {
|
||||
private static final Set<String> forbiddenMethods = new HashSet<String>(64);
|
||||
private static final Set<Class<?>> forbiddenClasses = new HashSet<Class<?>>(64);
|
||||
private static final Map<Class<?>, Class<?>> primitiveMap = new HashMap<Class<?>, Class<?>>(64);
|
||||
private static final SyncWriteMap<Long, MethodInfo> methodCache = new SyncWriteMap<Long, MethodInfo>(2048, 0.25F);
|
||||
private static final SyncWriteMap<Long, Object> methodCache = new SyncWriteMap<Long, Object>(2048, 0.25F);
|
||||
|
||||
// 初始化在模板中调用 method 时所在的被禁止使用类
|
||||
static {
|
||||
@ -49,9 +49,7 @@ public class MethodKit {
|
||||
System.class, Runtime.class, Thread.class, Class.class, ClassLoader.class, File.class,
|
||||
Compiler.class, InheritableThreadLocal.class, Package.class, Process.class,
|
||||
RuntimePermission.class, SecurityManager.class, ThreadGroup.class, ThreadLocal.class,
|
||||
|
||||
java.lang.reflect.Method.class,
|
||||
java.lang.reflect.Proxy.class
|
||||
java.lang.reflect.Method.class
|
||||
};
|
||||
for (Class<?> c : cs) {
|
||||
forbiddenClasses.add(c);
|
||||
@ -64,8 +62,8 @@ public class MethodKit {
|
||||
"getClass", "getDeclaringClass", "forName", "newInstance", "getClassLoader",
|
||||
"invoke", // "getMethod", "getMethods", // "getField", "getFields",
|
||||
"notify", "notifyAll", "wait",
|
||||
"exit", "loadLibrary", "halt", // "load",
|
||||
"stop", "suspend", "resume" // "setDaemon", "setPriority"
|
||||
"load", "exit", "loadLibrary", "halt",
|
||||
"stop", "suspend", "resume", "setDaemon", "setPriority",
|
||||
};
|
||||
for (String m : ms) {
|
||||
forbiddenMethods.add(m);
|
||||
@ -124,17 +122,36 @@ public class MethodKit {
|
||||
public static MethodInfo getMethod(Class<?> targetClass, String methodName, Object[] argValues) {
|
||||
Class<?>[] argTypes = getArgTypes(argValues);
|
||||
Long key = getMethodKey(targetClass, methodName, argTypes);
|
||||
MethodInfo method = methodCache.get(key);
|
||||
Object method = methodCache.get(key);
|
||||
if (method == null) {
|
||||
// 已确保不会返回 null，对于不存在的 Method，只进行一次获取操作
|
||||
// 提升 null safe 表达式性能，未来需要考虑内存泄漏风险
|
||||
method = doGetMethod(key, targetClass, methodName, argTypes);
|
||||
methodCache.putIfAbsent(key, method);
|
||||
if (method != null) {
|
||||
methodCache.putIfAbsent(key, method);
|
||||
} else {
|
||||
// 对于不存在的 Method，只进行一次获取操作，主要为了支持 null safe，未来需要考虑内存泄漏风险
|
||||
methodCache.putIfAbsent(key, Void.class);
|
||||
}
|
||||
}
|
||||
|
||||
return method;
|
||||
return method instanceof MethodInfo ? (MethodInfo)method : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 getter 方法
|
||||
* 使用与 Field 相同的 key，避免生成两次 key值
|
||||
* ---> jfinal 3.5 已将此功能转移至 FieldKit
|
||||
public static MethodInfo getGetterMethod(Long key, Class<?> targetClass, String methodName) {
|
||||
Object getterMethod = methodCache.get(key);
|
||||
if (getterMethod == null) {
|
||||
getterMethod = doGetMethod(key, targetClass, methodName, NULL_ARG_TYPES);
|
||||
if (getterMethod != null) {
|
||||
methodCache.putIfAbsent(key, getterMethod);
|
||||
} else {
|
||||
methodCache.putIfAbsent(key, Void.class);
|
||||
}
|
||||
}
|
||||
return getterMethod instanceof MethodInfo ? (MethodInfo)getterMethod : null;
|
||||
} */
|
||||
|
||||
static Class<?>[] getArgTypes(Object[] argValues) {
|
||||
if (argValues == null || argValues.length == 0) {
|
||||
return NULL_ARG_TYPES;
|
||||
@ -150,9 +167,7 @@ public class MethodKit {
|
||||
if (forbiddenClasses.contains(targetClass)) {
|
||||
throw new RuntimeException("Forbidden class: " + targetClass.getName());
|
||||
}
|
||||
|
||||
// 仅开启 forbiddenClasses 检测
|
||||
// Method、SharedMethod、StaticMethod 已用 MethodKit.isForbiddenMethod(...) 检测
|
||||
// if (forbiddenMethods.contains(methodName)) {
|
||||
// throw new RuntimeException("Forbidden method: " + methodName);
|
||||
// }
|
||||
@ -169,8 +184,7 @@ public class MethodKit {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return NullMethodInfo.me;
|
||||
return null;
|
||||
}
|
||||
|
||||
static boolean matchFixedArgTypes(Class<?>[] paraTypes, Class<?>[] argTypes) {
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.jfinal.template.expr.ast;
|
||||
|
||||
/**
|
||||
* NullMethodInfo
|
||||
*
|
||||
* 1：MethodKit.getMethod(...) 消除 instanceof 判断
|
||||
* 2：Method.exec(...) 消除 null 值判断
|
||||
*/
|
||||
public class NullMethodInfo extends MethodInfo {
|
||||
|
||||
public static final NullMethodInfo me = new NullMethodInfo();
|
||||
|
||||
public boolean notNull() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public Object invoke(Object target, Object... args) throws ReflectiveOperationException {
|
||||
throw new RuntimeException("The method invoke(Object, Object...) of NullMethodInfo should not be invoked");
|
||||
}
|
||||
}
|
||||
|
||||
@ -50,14 +50,6 @@ public class StaticMethod extends Expr {
|
||||
} catch (Exception e) {
|
||||
throw new ParseException(e.getMessage(), location, e);
|
||||
}
|
||||
|
||||
if (MethodKit.isForbiddenClass(this.clazz)) {
|
||||
throw new ParseException("Forbidden class: " + this.clazz.getName(), location);
|
||||
}
|
||||
if (MethodKit.isForbiddenMethod(methodName)) {
|
||||
throw new ParseException("Forbidden method: " + methodName, location);
|
||||
}
|
||||
|
||||
this.methodName = methodName;
|
||||
this.exprList = exprList;
|
||||
this.location = location;
|
||||
@ -69,7 +61,7 @@ public class StaticMethod extends Expr {
|
||||
try {
|
||||
MethodInfo methodInfo = MethodKit.getMethod(clazz, methodName, argValues);
|
||||
|
||||
if (methodInfo.notNull()) {
|
||||
if (methodInfo != null) {
|
||||
if (methodInfo.isStatic()) {
|
||||
return methodInfo.invoke(null, argValues);
|
||||
} else {
|
||||
|
||||
@ -63,7 +63,12 @@ public class EscapeDirective extends Directive {
|
||||
}
|
||||
|
||||
private void escape(String str, Writer w) throws IOException {
|
||||
for (int i = 0, len = str.length(); i < len; i++) {
|
||||
int len = str.length();
|
||||
if (len == 0) {
|
||||
return ;
|
||||
}
|
||||
|
||||
for (int i = 0; i < len; i++) {
|
||||
char cur = str.charAt(i);
|
||||
switch (cur) {
|
||||
case '<':
|
||||
|
||||
@ -53,9 +53,10 @@ public class NumberDirective extends Directive {
|
||||
|
||||
private Expr valueExpr;
|
||||
private Expr patternExpr;
|
||||
private int paraNum;
|
||||
|
||||
public void setExprList(ExprList exprList) {
|
||||
int paraNum = exprList.length();
|
||||
this.paraNum = exprList.length();
|
||||
if (paraNum == 0) {
|
||||
throw new ParseException("The parameter of #number directive can not be blank", location);
|
||||
}
|
||||
@ -63,8 +64,13 @@ public class NumberDirective extends Directive {
|
||||
throw new ParseException("Wrong number parameter of #number directive, two parameters allowed at most", location);
|
||||
}
|
||||
|
||||
valueExpr = exprList.getExpr(0);
|
||||
patternExpr = (paraNum == 1 ? null : exprList.getExpr(1));
|
||||
if (paraNum == 1) {
|
||||
this.valueExpr = exprList.getExpr(0);
|
||||
this.patternExpr = null;
|
||||
} else if (paraNum == 2) {
|
||||
this.valueExpr = exprList.getExpr(0);
|
||||
this.patternExpr = exprList.getExpr(1);
|
||||
}
|
||||
}
|
||||
|
||||
public void exec(Env env, Scope scope, Writer writer) {
|
||||
@ -73,9 +79,9 @@ public class NumberDirective extends Directive {
|
||||
return ;
|
||||
}
|
||||
|
||||
if (patternExpr == null) {
|
||||
if (paraNum == 1) {
|
||||
outputWithoutPattern(writer, value);
|
||||
} else {
|
||||
} else if (paraNum == 2) {
|
||||
outputWithPattern(scope, writer, value);
|
||||
}
|
||||
}
|
||||
|
||||
@ -194,14 +194,6 @@ public class JFinalViewResolver extends AbstractTemplateViewResolver {
|
||||
engine.setSourceFactory(sourceFactory);
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置为 ClassPathSourceFactory 的快捷方法
|
||||
* ClassPathSourceFactory 将从 CLASSPATH 与 jar 包中读取模板
|
||||
*/
|
||||
public void setToClassPathSourceFactory() {
|
||||
engine.setToClassPathSourceFactory();
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置模板基础路径
|
||||
*/
|
||||
|
||||
@ -50,17 +50,15 @@ public class ByteWriter extends Writer {
|
||||
}
|
||||
|
||||
public void write(String str, int offset, int len) throws IOException {
|
||||
int size, byteLen;
|
||||
while (len > 0) {
|
||||
size = (len > chars.length ? chars.length : len);
|
||||
|
||||
str.getChars(offset, offset + size, chars, 0);
|
||||
byteLen = encoder.encode(chars, 0, size, bytes);
|
||||
out.write(bytes, 0, byteLen);
|
||||
|
||||
offset += size;
|
||||
len -= size;
|
||||
while (len > chars.length) {
|
||||
write(str, offset, chars.length);
|
||||
offset += chars.length;
|
||||
len -= chars.length;
|
||||
}
|
||||
|
||||
str.getChars(offset, offset + len, chars, 0);
|
||||
int byteLen = encoder.encode(chars, 0, len, bytes);
|
||||
out.write(bytes, 0, byteLen);
|
||||
}
|
||||
|
||||
public void write(String str) throws IOException {
|
||||
@ -68,17 +66,15 @@ public class ByteWriter extends Writer {
|
||||
}
|
||||
|
||||
public void write(StringBuilder stringBuilder, int offset, int len) throws IOException {
|
||||
int size, byteLen;
|
||||
while (len > 0) {
|
||||
size = (len > chars.length ? chars.length : len);
|
||||
|
||||
stringBuilder.getChars(offset, offset + size, chars, 0);
|
||||
byteLen = encoder.encode(chars, 0, size, bytes);
|
||||
out.write(bytes, 0, byteLen);
|
||||
|
||||
offset += size;
|
||||
len -= size;
|
||||
while (len > chars.length) {
|
||||
write(stringBuilder, offset, chars.length);
|
||||
offset += chars.length;
|
||||
len -= chars.length;
|
||||
}
|
||||
|
||||
stringBuilder.getChars(offset, offset + len, chars, 0);
|
||||
int byteLen = encoder.encode(chars, 0, len, bytes);
|
||||
out.write(bytes, 0, byteLen);
|
||||
}
|
||||
|
||||
public void write(StringBuilder stringBuilder) throws IOException {
|
||||
|
||||
@ -44,16 +44,14 @@ public class CharWriter extends Writer {
|
||||
}
|
||||
|
||||
public void write(String str, int offset, int len) throws IOException {
|
||||
int size;
|
||||
while (len > 0) {
|
||||
size = (len > chars.length ? chars.length : len);
|
||||
|
||||
str.getChars(offset, offset + size, chars, 0);
|
||||
out.write(chars, 0, size);
|
||||
|
||||
offset += size;
|
||||
len -= size;
|
||||
while (len > chars.length) {
|
||||
write(str, offset, chars.length);
|
||||
offset += chars.length;
|
||||
len -= chars.length;
|
||||
}
|
||||
|
||||
str.getChars(offset, offset + len, chars, 0);
|
||||
out.write(chars, 0, len);
|
||||
}
|
||||
|
||||
public void write(String str) throws IOException {
|
||||
@ -61,16 +59,14 @@ public class CharWriter extends Writer {
|
||||
}
|
||||
|
||||
public void write(StringBuilder stringBuilder, int offset, int len) throws IOException {
|
||||
int size;
|
||||
while (len > 0) {
|
||||
size = (len > chars.length ? chars.length : len);
|
||||
|
||||
stringBuilder.getChars(offset, offset + size, chars, 0);
|
||||
out.write(chars, 0, size);
|
||||
|
||||
offset += size;
|
||||
len -= size;
|
||||
while (len > chars.length) {
|
||||
write(stringBuilder, offset, chars.length);
|
||||
offset += chars.length;
|
||||
len -= chars.length;
|
||||
}
|
||||
|
||||
stringBuilder.getChars(offset, offset + len, chars, 0);
|
||||
out.write(chars, 0, len);
|
||||
}
|
||||
|
||||
public void write(StringBuilder stringBuilder) throws IOException {
|
||||
|
||||
@ -25,7 +25,7 @@ import java.util.Map;
|
||||
*/
|
||||
public class DateFormats {
|
||||
|
||||
private Map<String, SimpleDateFormat> map = new HashMap<String, SimpleDateFormat>(16, 0.25F);
|
||||
private Map<String, SimpleDateFormat> map = new HashMap<String, SimpleDateFormat>();
|
||||
|
||||
public SimpleDateFormat getDateFormat(String datePattern) {
|
||||
SimpleDateFormat ret = map.get(datePattern);
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com).
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.jfinal.template.io;
|
||||
|
||||
/**
|
||||
* JdkEncoderFactory
|
||||
*
|
||||
* 支持 utf8mb4，支持 emoji 表情字符，支持各种罕见字符编码
|
||||
*
|
||||
* <pre>
|
||||
* 配置方法：
|
||||
* engine.setToJdkEncoderFactory();
|
||||
* </pre>
|
||||
*/
|
||||
public class JdkEncoderFactory extends EncoderFactory {
|
||||
|
||||
@Override
|
||||
public Encoder getEncoder() {
|
||||
return new JdkEncoder(charset);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
package com.jfinal.template.io;
|
||||
|
||||
// import java.nio.charset.MalformedInputException;
|
||||
import java.nio.charset.MalformedInputException;
|
||||
|
||||
/**
|
||||
* Utf8Encoder
|
||||
@ -62,16 +62,12 @@ public class Utf8Encoder extends Encoder {
|
||||
if (Character.isLowSurrogate(d)) {
|
||||
uc = Character.toCodePoint(c, d);
|
||||
} else {
|
||||
// throw new RuntimeException("encode UTF8 error", new MalformedInputException(1));
|
||||
bytes[dp++] = (byte) '?';
|
||||
continue;
|
||||
throw new RuntimeException("encode UTF8 error", new MalformedInputException(1));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (Character.isLowSurrogate(c)) {
|
||||
// throw new RuntimeException("encode UTF8 error", new MalformedInputException(1));
|
||||
bytes[dp++] = (byte) '?';
|
||||
continue;
|
||||
throw new RuntimeException("encode UTF8 error", new MalformedInputException(1));
|
||||
} else {
|
||||
uc = c;
|
||||
}
|
||||
|
||||
@ -18,7 +18,6 @@ package com.jfinal.template.stat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* DKFF(Dynamic Key Feature Forward) Lexer
|
||||
@ -36,14 +35,10 @@ class Lexer {
|
||||
int forwardRow = 1;
|
||||
TextToken previousTextToken = null;
|
||||
|
||||
String fileName;
|
||||
Set<String> keepLineBlankDirectives;
|
||||
|
||||
List<Token> tokens = new ArrayList<Token>();
|
||||
String fileName;
|
||||
|
||||
public Lexer(StringBuilder content, String fileName, Set<String> keepLineBlankDirectives) {
|
||||
this.keepLineBlankDirectives = keepLineBlankDirectives;
|
||||
|
||||
public Lexer(StringBuilder content, String fileName) {
|
||||
int len = content.length();
|
||||
buf = new char[len + 1];
|
||||
content.getChars(0, content.length(), buf, 0);
|
||||
@ -115,7 +110,7 @@ class Lexer {
|
||||
para = scanPara("");
|
||||
idToken = new Token(Symbol.OUTPUT, beginRow);
|
||||
paraToken = new ParaToken(para, beginRow);
|
||||
return addIdParaToken(idToken, paraToken);
|
||||
return addOutputToken(idToken, paraToken);
|
||||
}
|
||||
if (CharTable.isLetter(peek())) { // # id
|
||||
state = 10;
|
||||
@ -477,6 +472,31 @@ class Lexer {
|
||||
}
|
||||
}
|
||||
|
||||
// 输出指令不对前后空白与换行进行任何处理，直接调用 tokens.add(...)
|
||||
boolean addOutputToken(Token idToken, Token paraToken) {
|
||||
tokens.add(idToken);
|
||||
tokens.add(paraToken);
|
||||
previousTextToken = null;
|
||||
return prepareNextScan(0);
|
||||
}
|
||||
|
||||
// 向前看后续是否跟随的是空白 + 换行或者是空白 + EOF，是则表示当前指令后续没有其它有用内容
|
||||
boolean lookForwardLineFeedAndEof() {
|
||||
int forwardBak = forward;
|
||||
int forwardRowBak = forwardRow;
|
||||
for (char c=peek(); true; c=next()) {
|
||||
if (CharTable.isBlank(c)) {
|
||||
continue ;
|
||||
}
|
||||
if (c == '\n' || c == EOF) {
|
||||
return true;
|
||||
}
|
||||
forward = forwardBak;
|
||||
forwardRow = forwardRowBak;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 带参指令处于独立行时删除前后空白字符，并且再删除一个后续的换行符
|
||||
* 处于独立行是指：向前看无有用内容，在前面情况成立的基础之上
|
||||
@ -489,66 +509,30 @@ class Lexer {
|
||||
tokens.add(idToken);
|
||||
tokens.add(paraToken);
|
||||
|
||||
skipFollowingComment();
|
||||
|
||||
// 保留指令所在行空白字符
|
||||
// #define xxx() 模板函数名、#@xxx() 模板函数名，可以与指令同名，需要排除掉这三种 Symbol
|
||||
if (keepLineBlankDirectives.contains(idToken.value())
|
||||
&& idToken.symbol != Symbol.DEFINE
|
||||
&& idToken.symbol != Symbol.CALL
|
||||
&& idToken.symbol != Symbol.CALL_IF_DEFINED
|
||||
) {
|
||||
|
||||
prepareNextScan(0);
|
||||
} else {
|
||||
trimLineBlank();
|
||||
}
|
||||
|
||||
previousTextToken = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
// #set 这类指令，处在独立一行时，需要删除当前行的前后空白字符以及行尾字符 '\n'
|
||||
void trimLineBlank() {
|
||||
// if (lookForwardLineFeed() && (deletePreviousTextTokenBlankTails() || lexemeBegin == 0)) {
|
||||
if (lookForwardLineFeedAndEof() && deletePreviousTextTokenBlankTails()) {
|
||||
prepareNextScan(peek() != EOF ? 1 : 0);
|
||||
} else {
|
||||
prepareNextScan(0);
|
||||
}
|
||||
}
|
||||
|
||||
// 无参指令无条件调用 trimLineBlank()
|
||||
boolean addNoParaToken(Token noParaToken) {
|
||||
tokens.add(noParaToken);
|
||||
|
||||
skipFollowingComment();
|
||||
|
||||
if (CharTable.isBlank(peek())) {
|
||||
next(); // 无参指令之后紧随的一个空白字符仅为分隔符，不参与后续扫描
|
||||
}
|
||||
|
||||
trimLineBlank();
|
||||
|
||||
previousTextToken = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
// 向前看后续是否跟随的是空白 + 换行或者是空白 + EOF，是则表示当前指令后续没有其它有用内容
|
||||
boolean lookForwardLineFeedAndEof() {
|
||||
int fp = forward;
|
||||
for (char c=buf[fp]; true; c=buf[++fp]) {
|
||||
if (CharTable.isBlank(c)) {
|
||||
continue ;
|
||||
}
|
||||
|
||||
if (c == '\n' || c == EOF) {
|
||||
forward = fp;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
// 处理前后空白的逻辑与 addIdParaToken() 基本一样，仅仅多了一个对于紧随空白的 next() 操作
|
||||
boolean addNoParaToken(Token noParaToken) {
|
||||
tokens.add(noParaToken);
|
||||
if (CharTable.isBlank(peek())) {
|
||||
next(); // 无参指令之后紧随的一个空白字符仅为分隔符，不参与后续扫描
|
||||
}
|
||||
|
||||
if (lookForwardLineFeedAndEof() && deletePreviousTextTokenBlankTails()) {
|
||||
prepareNextScan(peek() != EOF ? 1 : 0);
|
||||
} else {
|
||||
prepareNextScan(0);
|
||||
}
|
||||
previousTextToken = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -559,54 +543,6 @@ class Lexer {
|
||||
// return previousTextToken != null ? previousTextToken.deleteBlankTails() : false;
|
||||
return previousTextToken == null || previousTextToken.deleteBlankTails();
|
||||
}
|
||||
|
||||
/**
|
||||
* 跳过指令后方跟随的注释，以便正确处理各类换行逻辑
|
||||
*/
|
||||
void skipFollowingComment() {
|
||||
int fp = forward;
|
||||
for (char c=buf[fp]; true; c=buf[++fp]) {
|
||||
if (CharTable.isBlank(c)) {
|
||||
continue ;
|
||||
}
|
||||
|
||||
// 勿使用 next()
|
||||
if (c == '#') {
|
||||
if (buf[fp + 1] == '#' && buf[fp + 2] == '#') {
|
||||
forward = fp;
|
||||
skipFollowingSingleLineComment();
|
||||
} else if (buf[fp + 1] == '-' && buf[fp + 2] == '-') {
|
||||
forward = fp;
|
||||
skipFollowingMultiLineComment();
|
||||
}
|
||||
}
|
||||
|
||||
return ;
|
||||
}
|
||||
}
|
||||
|
||||
void skipFollowingSingleLineComment() {
|
||||
forward = forward + 3;
|
||||
for (char c=peek(); true; c=next()) {
|
||||
if (c == '\n' || c == EOF) {
|
||||
break ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void skipFollowingMultiLineComment() {
|
||||
forward = forward + 3;
|
||||
for (char c=peek(); true; c=next()) {
|
||||
if (c == '-' && buf[forward + 1] == '-' && buf[forward + 2] == '#') {
|
||||
forward = forward + 3;
|
||||
break ;
|
||||
}
|
||||
|
||||
if (c == EOF) {
|
||||
throw new ParseException("The multiline comment start block \"#--\" can not match the end block: \"--#\"", new Location(fileName, beginRow));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ public class Parser {
|
||||
}
|
||||
|
||||
public StatList parse() {
|
||||
tokenList = new Lexer(content, fileName, env.getEngineConfig().getKeepLineBlankDirectives()).scan();
|
||||
tokenList = new Lexer(content, fileName).scan();
|
||||
tokenList.add(EOF);
|
||||
StatList statList = statList();
|
||||
if (peek() != EOF) {
|
||||
@ -207,11 +207,11 @@ public class Parser {
|
||||
matchEnd(name);
|
||||
}
|
||||
return ret;
|
||||
case EOF:
|
||||
case PARA:
|
||||
case ELSEIF:
|
||||
case ELSE:
|
||||
case END:
|
||||
case EOF:
|
||||
case CASE:
|
||||
case DEFAULT:
|
||||
return null;
|
||||
|
||||
@ -78,7 +78,6 @@ public class Scope {
|
||||
if (cur.data == null) { // 支持顶层 data 为 null 值
|
||||
cur.data = new HashMap();
|
||||
}
|
||||
|
||||
cur.data.put(key, value);
|
||||
return ;
|
||||
}
|
||||
@ -90,8 +89,7 @@ public class Scope {
|
||||
* 自内向外在作用域栈中查找变量，返回最先找到的变量
|
||||
*/
|
||||
public Object get(Object key) {
|
||||
Scope cur = this;
|
||||
do {
|
||||
for (Scope cur=this; cur!=null; cur=cur.parent) {
|
||||
// if (cur.data != null && cur.data.containsKey(key)) {
|
||||
// return cur.data.get(key);
|
||||
// }
|
||||
@ -106,10 +104,7 @@ public class Scope {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
cur = cur.parent;
|
||||
} while (cur != null);
|
||||
|
||||
}
|
||||
// return null;
|
||||
return sharedObjectMap != null ? sharedObjectMap.get(key) : null;
|
||||
}
|
||||
@ -160,10 +155,6 @@ public class Scope {
|
||||
public void setGlobal(Object key, Object value) {
|
||||
for (Scope cur=this; true; cur=cur.parent) {
|
||||
if (cur.parent == null) {
|
||||
if (cur.data == null) {
|
||||
cur.data = new HashMap();
|
||||
}
|
||||
|
||||
cur.data.put(key, value);
|
||||
return ;
|
||||
}
|
||||
@ -177,7 +168,7 @@ public class Scope {
|
||||
public Object getGlobal(Object key) {
|
||||
for (Scope cur=this; true; cur=cur.parent) {
|
||||
if (cur.parent == null) {
|
||||
return cur.data != null ? cur.data.get(key) : null;
|
||||
return cur.data.get(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -189,10 +180,7 @@ public class Scope {
|
||||
public void removeGlobal(Object key) {
|
||||
for (Scope cur=this; true; cur=cur.parent) {
|
||||
if (cur.parent == null) {
|
||||
if (cur.data != null) {
|
||||
cur.data.remove(key);
|
||||
}
|
||||
|
||||
cur.data.remove(key);
|
||||
return ;
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,9 +63,6 @@ class TextToken extends Token {
|
||||
}
|
||||
|
||||
// 两个指令之间全是空白字符， 设置其长度为 0，为 Parser 过滤内容为空的 Text 节点做准备
|
||||
// 典型测试用例：两个带有前导空格，并且都在独立一行的 #set(...) 指令，前一个 #set 指令
|
||||
// 虽然是 '\n' 结尾，但已在 Lexer 中被 prepareNextScan(...) 删掉
|
||||
// 另一典型用例：#date() #date()，可通过配置 keepLineBlank 为 true 保留指令间的空白字符
|
||||
text.setLength(0);
|
||||
return true; // 当两指令之间全为空白字符时，告知调用方需要吃掉行尾的 '\n'
|
||||
}
|
||||
|
||||
@ -20,7 +20,6 @@ import com.jfinal.template.Env;
|
||||
import com.jfinal.template.expr.ast.Assign;
|
||||
import com.jfinal.template.expr.ast.Expr;
|
||||
import com.jfinal.template.expr.ast.ExprList;
|
||||
import com.jfinal.template.expr.ast.IncDec;
|
||||
import com.jfinal.template.io.Writer;
|
||||
import com.jfinal.template.stat.Location;
|
||||
import com.jfinal.template.stat.ParseException;
|
||||
@ -45,11 +44,10 @@ public class Set extends Stat {
|
||||
}
|
||||
|
||||
for (Expr expr : exprList.getExprArray()) {
|
||||
if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
|
||||
if ( !(expr instanceof Assign) ) {
|
||||
throw new ParseException("#set directive only supports assignment expressions", location);
|
||||
}
|
||||
}
|
||||
|
||||
this.expr = exprList.getActualExpr();
|
||||
}
|
||||
|
||||
|
||||
@ -20,7 +20,6 @@ import com.jfinal.template.Env;
|
||||
import com.jfinal.template.expr.ast.Assign;
|
||||
import com.jfinal.template.expr.ast.Expr;
|
||||
import com.jfinal.template.expr.ast.ExprList;
|
||||
import com.jfinal.template.expr.ast.IncDec;
|
||||
import com.jfinal.template.io.Writer;
|
||||
import com.jfinal.template.stat.Ctrl;
|
||||
import com.jfinal.template.stat.Location;
|
||||
@ -42,11 +41,10 @@ public class SetGlobal extends Stat {
|
||||
}
|
||||
|
||||
for (Expr expr : exprList.getExprArray()) {
|
||||
if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
|
||||
if ( !(expr instanceof Assign) ) {
|
||||
throw new ParseException("#setGlobal directive only supports assignment expressions", location);
|
||||
}
|
||||
}
|
||||
|
||||
this.expr = exprList.getActualExpr();
|
||||
}
|
||||
|
||||
|
||||
@ -20,7 +20,6 @@ import com.jfinal.template.Env;
|
||||
import com.jfinal.template.expr.ast.Assign;
|
||||
import com.jfinal.template.expr.ast.Expr;
|
||||
import com.jfinal.template.expr.ast.ExprList;
|
||||
import com.jfinal.template.expr.ast.IncDec;
|
||||
import com.jfinal.template.io.Writer;
|
||||
import com.jfinal.template.stat.Ctrl;
|
||||
import com.jfinal.template.stat.Location;
|
||||
@ -43,11 +42,10 @@ public class SetLocal extends Stat {
|
||||
}
|
||||
|
||||
for (Expr expr : exprList.getExprArray()) {
|
||||
if ( !(expr instanceof Assign || expr instanceof IncDec) ) {
|
||||
if ( !(expr instanceof Assign) ) {
|
||||
throw new ParseException("#setLocal directive only supports assignment expressions", location);
|
||||
}
|
||||
}
|
||||
|
||||
this.expr = exprList.getActualExpr();
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#tpl("findGirl")
|
||||
select * from girl where age > ? and age < ? and weight < 50
|
||||
#end
|
||||
|
||||
#tpl("findGirl2")
|
||||
select * from girl where age > ? and age < ? and weight < 50
|
||||
#end
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
package com.jfinal.template;
|
||||
|
||||
import com.jfinal.kit.Kv;
|
||||
import com.jfinal.kit.TplKit;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
public class TplKitTest {
|
||||
|
||||
@Test
|
||||
public void run() {
|
||||
TplKit tplKit = TplKit.use("", true);
|
||||
|
||||
tplKit.addTplTemplate(new File("E:\\wk\\HaoGamePlatfProject\\conf"), x -> x.getName().endsWith(".tpl"));
|
||||
|
||||
|
||||
tplKit.parseTplTemplate();
|
||||
|
||||
TplKit tplKit2 = TplKit.use("", true);
|
||||
|
||||
String findGirl = tplKit2.getTpl("abx", Kv.by("a", 12321));
|
||||
|
||||
System.out.println(findGirl);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user