Skip to content

Commit 7f36654

Browse files
netbuffernetbuffer
committed
update
1 parent c9c9cb8 commit 7f36654

File tree

9 files changed

+64
-53
lines changed

9 files changed

+64
-53
lines changed

‎.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
/.idea
2-
/target
3-
/*.iml
1+
.idea
2+
target
3+
jfinal-bootstrap-table.iml
4+
logs

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# jfinal-bootstrap-table demo
22
## 技术栈/technology stack
3-
* jfinal3.3
3+
* jfinal4.8
44
* poi3
55
* ehcache
66
* 自定义标签开发

‎pom.xml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>cn.netbuffer.jfinal-bootstrap-table</groupId>
56
<artifactId>jfinal-bootstrap-table</artifactId>
6-
<packaging>war</packaging>
77
<version>0.0.1-SNAPSHOT</version>
8+
<packaging>war</packaging>
9+
810
<name>jfinal-bootstrap-table Maven Webapp</name>
911
<url>http://netbuffer.github.io</url>
1012
<developers>
@@ -15,13 +17,13 @@
1517
<url>http://netbuffer.github.io</url>
1618
</developer>
1719
</developers>
20+
1821
<properties>
1922
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
<jfinal.version>3.3</jfinal.version>
23+
<jfinal.version>4.8</jfinal.version>
24+
<freemarker.version>2.3.30</freemarker.version>
2125
</properties>
22-
<!-- 引用parent依赖 -->
23-
<!-- <parent> <groupId>cn.netbuffer.app</groupId> <artifactId>app</artifactId>
24-
<version>0.0.1-SNAPSHOT</version> </parent> -->
26+
2527
<dependencies>
2628
<dependency>
2729
<groupId>com.jfinal</groupId>
@@ -31,7 +33,7 @@
3133
<dependency>
3234
<groupId>org.freemarker</groupId>
3335
<artifactId>freemarker</artifactId>
34-
<version>2.3.23</version>
36+
<version>${freemarker.version}</version>
3537
</dependency>
3638
<dependency>
3739
<groupId>jstl</groupId>
@@ -56,22 +58,20 @@
5658
<version>2.2.1-b03</version>
5759
<scope>provided</scope>
5860
</dependency>
59-
<!-- <dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId>
60-
<version>0.9.5.2</version> </dependency> -->
6161
<dependency>
6262
<groupId>com.alibaba</groupId>
6363
<artifactId>druid</artifactId>
64-
<version>1.0.16</version>
64+
<version>1.1.22</version>
6565
</dependency>
6666
<dependency>
6767
<groupId>commons-beanutils</groupId>
6868
<artifactId>commons-beanutils</artifactId>
69-
<version>1.9.2</version>
69+
<version>1.9.4</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.apache.commons</groupId>
7373
<artifactId>commons-lang3</artifactId>
74-
<version>3.7</version>
74+
<version>3.10</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>commons-codec</groupId>
@@ -113,9 +113,16 @@
113113
<artifactId>ehcache</artifactId>
114114
<version>2.8.1</version>
115115
</dependency>
116+
<dependency>
117+
<groupId>org.projectlombok</groupId>
118+
<artifactId>lombok</artifactId>
119+
<version>1.18.12</version>
120+
<scope>provided</scope>
121+
</dependency>
116122
</dependencies>
123+
117124
<build>
118-
<finalName>jfinal-bootstrap-table</finalName>
125+
<finalName>${project.artifactId}</finalName>
119126
<resources>
120127
<resource>
121128
<directory>src/main/resources</directory>

‎src/main/resources/user.sql renamed to ‎sql/user.sql

File renamed without changes.

‎src/main/java/cn/netbuffer/jfinal_bootstrap_table/config/AdminRoutes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
/**
99
* 后端路由规则
10-
* @author champ
10+
* @author netbuffer
1111
*/
1212
public class AdminRoutes extends Routes {
1313

‎src/main/java/cn/netbuffer/jfinal_bootstrap_table/config/AppConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/**
3737
* jfinal配置文件
3838
*
39-
* @author champ
39+
* @author netbuffer
4040
*
4141
*/
4242
public class AppConfig extends JFinalConfig {
@@ -68,9 +68,9 @@ public void beforeJFinalStop() {
6868
*/
6969
@Override
7070
public void configConstant(Constants me) {
71-
Prop p = PropKit.use("config.properties");
72-
LOGGER.info("p:{}",p);
73-
me.setDevMode(p.getBoolean("app.devMode"));// 开发模式
71+
Prop config = PropKit.use("config.properties");
72+
LOGGER.info("config.properties:{}",config);
73+
me.setDevMode(config.getBoolean("app.devMode"));// 开发模式
7474
me.setEncoding("utf8");
7575
/**
7676
* 该路径参数接受以”/”打头或者以 windows 磁盘盘符打头的绝对路径，

‎src/main/java/cn/netbuffer/jfinal_bootstrap_table/filter/TrimFilter.java

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package cn.netbuffer.jfinal_bootstrap_table.filter;
22

3+
import lombok.extern.slf4j.Slf4j;
4+
35
import java.io.IOException;
46

57
import javax.servlet.Filter;
@@ -12,33 +14,33 @@
1214

1315
/**
1416
* 过滤空白符号filter
15-
*
16-
* @author champ
1717
*
18+
* @author netbuffer
1819
*/
20+
@Slf4j
1921
public class TrimFilter implements Filter {
2022

21-
private FilterConfig filterConfig;
22-
23-
public void init(FilterConfig filterConfig) throws ServletException {
24-
this.filterConfig = filterConfig;
25-
}
26-
27-
public void destroy() {
28-
}
29-
30-
public void doFilter(ServletRequest request, ServletResponse response,
31-
FilterChain chain) throws IOException, ServletException {
32-
boolean enable = Boolean.parseBoolean(filterConfig
33-
.getInitParameter("enable"));
34-
if (enable) {
35-
System.out.println("清除空白");
36-
chain.doFilter(
37-
new TrimRequestWrapper((HttpServletRequest) request),
38-
response);
39-
} else {
40-
System.out.println("直接放行");
41-
chain.doFilter(request, response);
42-
}
43-
}
23+
private FilterConfig filterConfig;
24+
25+
public void init(FilterConfig filterConfig) throws ServletException {
26+
this.filterConfig = filterConfig;
27+
}
28+
29+
public void destroy() {
30+
}
31+
32+
public void doFilter(ServletRequest request, ServletResponse response,
33+
FilterChain chain) throws IOException, ServletException {
34+
boolean enable = Boolean.parseBoolean(filterConfig.getInitParameter("enable"));
35+
String requri = ((HttpServletRequest) request).getRequestURI();
36+
if (enable) {
37+
log.debug("{}清除空白", requri);
38+
chain.doFilter(
39+
new TrimRequestWrapper((HttpServletRequest) request),
40+
response);
41+
} else {
42+
log.debug("{}直接放行", requri);
43+
chain.doFilter(request, response);
44+
}
45+
}
4446
}

‎src/main/java/cn/netbuffer/jfinal_bootstrap_table/interceptor/AuthInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/**
1111
* 认证拦截器
12-
* @author champ
12+
* @author netbuffer
1313
*/
1414
public class AuthInterceptor implements Interceptor {
1515
private static Logger authlogger=LoggerFactory.getLogger(AuthInterceptor.class);

‎src/main/resources/logback.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
<property name="logname" value="jfinal-bootstrap-table" />
4-
<property name="logbase" value="${catalina.base}/logs/jfinal-bootstrap-table/" />
3+
4+
<property name="logbase" value="${project.basedir}/logs/jfinal-bootstrap-table/" />
5+
56
<jmxConfigurator/>
67
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
78
<encoder charset="utf-8">
@@ -10,11 +11,12 @@
1011
</encoder>
1112
</encoder>
1213
</appender>
14+
1315
<appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
1416
<Prudent>true</Prudent>
1517
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
1618
<FileNamePattern>
17-
${logbase}${logname}.%d{yyyy-MM-dd}.html
19+
${logbase}%d{yyyy-MM-dd}.html
1820
</FileNamePattern>
1921
</rollingPolicy>
2022
<layout class="ch.qos.logback.classic.html.HTMLLayout">
@@ -24,11 +26,10 @@
2426
</layout>
2527
</appender>
2628

27-
<logger name="com.alibaba" level="DEBUG" />
28-
2929
<root>
30-
<level value="DEBUG" />
30+
<level value="INFO" />
3131
<appender-ref ref="stdout" />
3232
<appender-ref ref="logfile" />
3333
</root>
34+
3435
</configuration>

0 commit comments

Comments
 (0)