From 3714f058492088b656a75eec06fb94b6000127cb Mon Sep 17 00:00:00 2001 From: "Judas.n" Date: Sun, 3 Apr 2016 11:27:31 +0800 Subject: [PATCH 1/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9bdd0dd..9ba4a3d 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,8 @@ ## 项目演示视频下载 +- **Maven 本地仓库打包下载** + - 百度云盘： - **单模块的 Spring MVC + Spring + Mybatis 讲解（基于 IntelliJ IDEA）** - 百度云盘： - 360 云盘（6d49）： From c3ed992c88935e85d159401603befe0bab389cba Mon Sep 17 00:00:00 2001 From: "Judas.n" Date: Tue, 5 Apr 2016 08:08:45 +0800 Subject: [PATCH 2/5] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9ba4a3d..354d520 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,10 @@ - JDK 7（理论上支持 JDK 6、JDK 7、JDK 8） - Maven 3.1.1 - Mysql 5.6 - - Maven 3.1.1 - Tomcat 7 - IDE：IntelliJ IDEA 15.0.4 - SSM 版本： - - spring version：**3.2.16.RELEASE** + - spring version：**3.2.16.RELEASE（也支持 4.1、4.2）** - mybatis version：**3.3.1** - mybatis-spring version：**1.2.4** From 5d7380fe99f387bebc5c9585c75d9ba8bec221b0 Mon Sep 17 00:00:00 2001 From: judasn Date: Thu, 21 Apr 2016 10:32:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?2016-04-21=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E6=9E=B6=E6=94=B9=E4=B8=BALogback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 45 ++++++++--- .../user/controller/SysUserController.java | 17 ++++ ...log4j.properties => log4j.properties.back} | 0 src/main/resources/logback.xml | 77 +++++++++++++++++++ src/test/java/com/youmeek/ssm/SSMTest.java | 4 +- 5 files changed, 128 insertions(+), 15 deletions(-) rename src/main/resources/{log4j.properties => log4j.properties.back} (100%) create mode 100644 src/main/resources/logback.xml diff --git a/pom.xml b/pom.xml index e6ba6f4..6c42d15 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 5.1.21 1.0.4 - 1.7.7 + 1.2.17 7.0 @@ -270,23 +270,44 @@ + + + + + + + + + + + + + + + + + + + + + + - log4j - log4j - ${log4j.version} + ch.qos.logback + logback-classic + 1.1.7 - - org.slf4j - slf4j-api - ${slf4j.version} + log4j + log4j + 1.2.17 - - org.slf4j - slf4j-log4j12 - ${slf4j.version} + org.logback-extensions + logback-ext-spring + 0.1.4 + diff --git a/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java b/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java index eee8ba7..1e4fe7a 100644 --- a/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java +++ b/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java @@ -2,6 +2,8 @@ import com.youmeek.ssm.module.user.pojo.SysUser; import com.youmeek.ssm.module.user.service.SysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; @@ -9,10 +11,14 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.Date; @Controller @RequestMapping("/sysUserController") public class SysUserController { + + static final Logger LOG = LoggerFactory.getLogger(SysUserController.class); + @Resource private SysUserService sysUserService; @@ -31,6 +37,17 @@ public SysUser showUser(@PathVariable("userId") Long userId){ } + @RequestMapping("/test-logback") + @ResponseBody + public Date testLogback(){ + LOG.trace("-----------------------------------trace"); + LOG.debug("-----------------------------------debug"); + LOG.info("-----------------------------------info"); + LOG.warn("-----------------------------------warn"); + LOG.error("-----------------------------------error"); + return new Date(); + } + diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties.back similarity index 100% rename from src/main/resources/log4j.properties rename to src/main/resources/log4j.properties.back diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..9478532 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] -- [%p] -- [%thread >>>> %F:%L >>>> Method = %M] -- [Content = %m]%n + + + + + + + + + ${LOG_HOME}/logbackOutFile.log.%d{yyyy-MM-dd}.log + + 30 + + + [%d{yyyy-MM-dd HH:mm:ss.SSS}] -- [%p] -- [%thread >>>> %F:%L >>>> Method = %M] -- [Content = %m]%n + + + + 10MB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/com/youmeek/ssm/SSMTest.java b/src/test/java/com/youmeek/ssm/SSMTest.java index a7d3e72..7fd2d97 100644 --- a/src/test/java/com/youmeek/ssm/SSMTest.java +++ b/src/test/java/com/youmeek/ssm/SSMTest.java @@ -2,7 +2,6 @@ import com.youmeek.ssm.module.user.pojo.SysUser; import com.youmeek.ssm.module.user.service.SysUserService; -import org.apache.log4j.Logger; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; @@ -14,7 +13,6 @@ @ContextConfiguration(locations = {"classpath*:spring/applicationContext*.xml"}) public class SSMTest { - private Logger logger = Logger.getLogger(this.getClass().getName()); @Resource private SysUserService sysUserService; @@ -22,6 +20,6 @@ public class SSMTest { @Test public void test1() { SysUser sysUser = sysUserService.getById(1L); - logger.info("--------------------------------" + sysUser.toString()); + System.out.println("--------------------------------" + sysUser.toString()); } } From 0c25228f128cdf89b2cbbce301055555819e0e55 Mon Sep 17 00:00:00 2001 From: judasn Date: Thu, 21 Apr 2016 10:50:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?2016-04-21=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E6=A1=86=E6=9E=B6=E6=94=B9=E4=B8=BALogback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youmeek/ssm/module/user/controller/SysUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java b/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java index 1e4fe7a..1a08a44 100644 --- a/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java +++ b/src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java @@ -17,7 +17,7 @@ @RequestMapping("/sysUserController") public class SysUserController { - static final Logger LOG = LoggerFactory.getLogger(SysUserController.class); + private static final Logger LOG = LoggerFactory.getLogger(SysUserController.class); @Resource private SysUserService sysUserService; From 47abd2a1b0cc5cc20c090cfa649d0874b7843056 Mon Sep 17 00:00:00 2001 From: Jason Zhou Date: Fri, 20 May 2016 00:04:25 +0800 Subject: [PATCH 5/5] Fix some bugs on init.sql for Mysql 5.6.15 --- doc/db/init.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/db/init.sql b/doc/db/init.sql index 638728e..b3b012e 100644 --- a/doc/db/init.sql +++ b/doc/db/init.sql @@ -1,11 +1,13 @@ # 创建数据库，并创建权限用户 -CREATE DATABASE `ssm` CHARACTER SET utf8; +# CREATE DATABASE 'ssm' CHARACTER SET utf8; +CREATE DATABASE ssm CHARACTER SET utf8 COLLATE utf8_general_ci; CREATE USER 'ssm'@'%' IDENTIFIED BY 'ssm'; GRANT ALL PRIVILEGES ON ssm.* TO 'ssm'@'%'; FLUSH PRIVILEGES; # 创建表 +USE ssm; CREATE TABLE `sys_user` ( `sys_user_id` bigint(20) NOT NULL, `sys_user_login_name` varchar(50) NOT NULL, @@ -31,7 +33,7 @@ CREATE TABLE `sys_user` ( # 创建表数据 - +USE ssm; insert into `sys_user`(`sys_user_id`,`sys_user_login_name`,`sys_user_login_password`,`sys_user_status`,`sys_user_is_delete`,`sys_user_register_datetime`,`sys_user_register_source`,`sys_user_type`,`sys_user_sex`,`sys_user_is_email_active`,`sys_user_is_mobile_active`,`sys_user_register_type`,`sys_user_pay_passwrod`,`sys_user_icon`,`sys_user_real_name`,`sys_user_email`,`sys_user_mobile`,`sys_user_weibo_id`,`sys_user_qq_id`) values (1,'YouMeek1','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩1','363379441@qq.com','13800000001','',''); insert into `sys_user`(`sys_user_id`,`sys_user_login_name`,`sys_user_login_password`,`sys_user_status`,`sys_user_is_delete`,`sys_user_register_datetime`,`sys_user_register_source`,`sys_user_type`,`sys_user_sex`,`sys_user_is_email_active`,`sys_user_is_mobile_active`,`sys_user_register_type`,`sys_user_pay_passwrod`,`sys_user_icon`,`sys_user_real_name`,`sys_user_email`,`sys_user_mobile`,`sys_user_weibo_id`,`sys_user_qq_id`) values (2,'YouMeek2','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩2','363379442@qq.com','13800000002','',''); insert into `sys_user`(`sys_user_id`,`sys_user_login_name`,`sys_user_login_password`,`sys_user_status`,`sys_user_is_delete`,`sys_user_register_datetime`,`sys_user_register_source`,`sys_user_type`,`sys_user_sex`,`sys_user_is_email_active`,`sys_user_is_mobile_active`,`sys_user_register_type`,`sys_user_pay_passwrod`,`sys_user_icon`,`sys_user_real_name`,`sys_user_email`,`sys_user_mobile`,`sys_user_weibo_id`,`sys_user_qq_id`) values (3,'YouMeek3','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩3','363379443@qq.com','13800000003','','');