From 794cbf2ee764ed003af24e1ccd59b43b43c40c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=8B=87?= <huangyong.java@gmail.com>
Date: Sun, 22 Jun 2014 13:23:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90I=E3=80=91=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=88=B0=20Smart=20Framework=202.3.1=E3=80=81Smart=20Security?=
 =?UTF-8?q?=20Plugin=201.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 4 ++--
 src/main/java/org/smart4j/sample/aspect/ActionAspect.java | 2 +-
 src/main/java/org/smart4j/sample/entity/Product.java      | 2 ++
 src/main/resources/log4j.properties                       | 4 +---
 src/main/resources/smart.properties                       | 2 +-
 src/main/webapp/WEB-INF/jsp/login.jsp                     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index c68b1fd..bbeafc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
         <jsp.version>2.2</jsp.version>
         <jstl.version>1.2</jstl.version>
         <mysql.version>5.1.25</mysql.version>
-        <smart-framework.version>2.3</smart-framework.version>
+        <smart-framework.version>2.3.1</smart-framework.version>
         <smart-plugin-i18n.version>1.0</smart-plugin-i18n.version>
-        <smart-plugin-security.version>1.0</smart-plugin-security.version>
+        <smart-plugin-security.version>1.0.1</smart-plugin-security.version>
         <smart-plugin-cache.version>1.0</smart-plugin-cache.version>
         <smart-plugin-soap.version>1.0</smart-plugin-soap.version>
         <smart-plugin-rest.version>1.0</smart-plugin-rest.version>
diff --git a/src/main/java/org/smart4j/sample/aspect/ActionAspect.java b/src/main/java/org/smart4j/sample/aspect/ActionAspect.java
index 4018662..2849e7e 100644
--- a/src/main/java/org/smart4j/sample/aspect/ActionAspect.java
+++ b/src/main/java/org/smart4j/sample/aspect/ActionAspect.java
@@ -22,7 +22,7 @@ public class ActionAspect extends AspectProxy {
 
     @Override
     public void after(Class<?> cls, Method method, Object[] params, Object result) throws Throwable {
-        logger.info("time: " + (System.currentTimeMillis() - begin) + "ms");
+        logger.debug("time: " + (System.currentTimeMillis() - begin) + "ms");
         logger.debug("----------- end -----------");
     }
 }
diff --git a/src/main/java/org/smart4j/sample/entity/Product.java b/src/main/java/org/smart4j/sample/entity/Product.java
index 245ebe8..b66c7a8 100644
--- a/src/main/java/org/smart4j/sample/entity/Product.java
+++ b/src/main/java/org/smart4j/sample/entity/Product.java
@@ -1,5 +1,6 @@
 package org.smart4j.sample.entity;
 
+import org.smart4j.framework.orm.annotation.Column;
 import org.smart4j.framework.orm.annotation.Entity;
 
 @Entity
@@ -9,6 +10,7 @@ public class Product {
 
     private long productTypeId;
 
+    @Column("product_name")
     private String name;
 
     private String code;
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 47741ff..647c3b5 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -13,6 +13,4 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
 
 log4j.logger.org.apache=ERROR
-log4j.logger.org.smart4j.framework=DEBUG
-log4j.logger.org.smart4j.plugin=DEBUG
-log4j.logger.org.smart4j.sample=DEBUG
+log4j.logger.org.smart4j=DEBUG
diff --git a/src/main/resources/smart.properties b/src/main/resources/smart.properties
index 71cf74b..a5f7a7f 100644
--- a/src/main/resources/smart.properties
+++ b/src/main/resources/smart.properties
@@ -14,6 +14,6 @@ smart.plugin.i18n.reloadable=true
 
 smart.plugin.security.realms=custom
 smart.plugin.security.custom.class=org.smart4j.sample.CustomSmartSecurity
-smart.plugin.security.cache=true
+smart.plugin.security.cacheable=true
 
 sample.upload_path=/www/upload/
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 9253e14..a05dece 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -12,7 +12,7 @@
 <body>
 
 <security:user>
-    <c:redirect context="${BASE}" url="/products"/>
+    <c:redirect context="/${BASE}" url="/products"/>
 </security:user>
 
 <div id="header">
-- 
Gitee


From ecd1c4393ef719f57017aafa8a7e06e09d38baeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=8B=87?= <huangyong.java@gmail.com>
Date: Sun, 22 Jun 2014 14:00:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90I=E3=80=91=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=88=B0=20Smart=20Framework=202.3.1=E3=80=81Smart=20Security?=
 =?UTF-8?q?=20Plugin=201.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/smart4j/sample/entity/Product.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/smart4j/sample/entity/Product.java b/src/main/java/org/smart4j/sample/entity/Product.java
index b66c7a8..245ebe8 100644
--- a/src/main/java/org/smart4j/sample/entity/Product.java
+++ b/src/main/java/org/smart4j/sample/entity/Product.java
@@ -1,6 +1,5 @@
 package org.smart4j.sample.entity;
 
-import org.smart4j.framework.orm.annotation.Column;
 import org.smart4j.framework.orm.annotation.Entity;
 
 @Entity
@@ -10,7 +9,6 @@ public class Product {
 
     private long productTypeId;
 
-    @Column("product_name")
     private String name;
 
     private String code;
-- 
Gitee


From 0dfd0767107edd8afd6b1fe128afff590f0af17d Mon Sep 17 00:00:00 2001
From: zhengzhisheng <zhengzhisheng@souche.com>
Date: Wed, 10 May 2017 20:52:51 +0800
Subject: [PATCH 3/3] test

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aa419f8..924e72c 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,6 @@ Smart Sample for Eclipse
 
 导入 Eclipse，可直接运行！
 
-[http://git.oschina.net/coxapp/smart-sample](http://git.oschina.net/coxapp/smart-sample)
\ No newline at end of file
+[http://git.oschina.net/coxapp/smart-sample](http://git.oschina.net/coxapp/smart-sample)
+
+test
\ No newline at end of file
-- 
Gitee