Skip to content

Commit

Permalink
2016-03-22重新调整结构，完善细节
Browse files Browse the repository at this point in the history
  • Loading branch information
@judasn
judasn committed Mar 22, 2016
1 parent ef8706f commit 5c43004
Show file tree
Hide file tree
Showing 15 changed files with 216 additions and 93 deletions.
8 changes: 6 additions & 2 deletions doc/db/init.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CREATE USER 'ssm'@'%' IDENTIFIED BY 'ssm';
GRANT ALL PRIVILEGES ON ssm.* TO 'ssm'@'%';
FLUSH PRIVILEGES;

DROP TABLE IF EXISTS `sys_user`;

# 创建表
CREATE TABLE `sys_user` (
Expand Down Expand Up @@ -32,6 +31,11 @@ CREATE TABLE `sys_user` (


# 创建表数据
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','[email protected]','13800000001','',''),(2,'YouMeek2','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩2','[email protected]','13800000002','',''),(3,'YouMeek3','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩3','[email protected]','13800000003','',''),(4,'YouMeek4','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩4','[email protected]','13800000004','',''),(5,'YouMeek5','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩5','[email protected]','13800000005','','');

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','[email protected]','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','[email protected]','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','[email protected]','13800000003','','');
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 (4,'YouMeek4','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩4','[email protected]','13800000004','','');
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 (5,'YouMeek5','e10adc3949ba59abbe56e057f20f883e','0','N','2016-02-24 00:12:23','0','0','0','Y','Y','0','e10adc3949ba59abbe56e057f20f883e','','张觉恩5','[email protected]','13800000005','','');


125 changes: 93 additions & 32 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
</description>
<url>http://code.YouMeek.com</url>

<!-- 集中定义公用的依赖版本号 -->
<!--版本变量设置 start-->
<properties>
<!--架包版本变量 start-->
Expand All @@ -29,8 +30,9 @@
<mybatis-spring.version>1.2.4</mybatis-spring.version>


<!--aspectj是springAOP需要用到-->
<!--下面这两个是springAOP需要用到-->
<aspectjweaver.version>1.7.2</aspectjweaver.version>
<persistence-api.version>1.0.2</persistence-api.version>


<junit.version>4.11</junit.version>
Expand All @@ -42,8 +44,8 @@

<javaee-api.version>7.0</javaee-api.version>
<jstl.version>1.2</jstl.version>
<jsp-api.version>2.2.1-b03</jsp-api.version>
<servlet-api.version>3.0-alpha-1</servlet-api.version>
<jsp-api.version>2.0</jsp-api.version>
<servlet-api.version>2.5</servlet-api.version>

<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-io.version>2.4</commons-io.version>
Expand All @@ -53,15 +55,14 @@

<httpclient.version>4.3.3</httpclient.version>
<jackson-databind.version>2.4.2</jackson-databind.version>


<fastjson.version>1.1.43</fastjson.version>
<!--架包版本变量 end-->

<!--插件版本变量 start-->
<tomcat6-maven-plugin.version>2.1</tomcat6-maven-plugin.version>
<tomcat7-maven-plugin.version>2.2</tomcat7-maven-plugin.version>
<jetty-plugin.version>8.1.16.v20140903</jetty-plugin.version>

<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.3</maven-war-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
Expand All @@ -75,7 +76,7 @@
<!--其他变量 start-->
<war-name.version>ssm</war-name.version>
<jdk.version>1.7</jdk.version>

<tomcat-port.version>8080</tomcat-port.version>
<tomcat-uri-encoding.version>UTF-8</tomcat-uri-encoding.version>
<tomcat-path.version>/</tomcat-path.version>
Expand All @@ -98,17 +99,20 @@

<!--架包依赖 start-->
<dependencies>

<!-- ############################################################### Spring 相关包 start ############################################################### -->
<!--spring 源码包下载地址：https://github.com/spring-projects/spring-framework/releases-->
<!--http://takeme.iteye.com/blog/1977585-->
<!--http://blog.csdn.net/bluishglc/article/details/6585221-->
<dependency>
<!-- 开发的时候引入，发布的时候不会加载此包 -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
<!-- spring核心包 -->

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>

Expand All @@ -117,11 +121,20 @@
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>

<!--这个jar 文件包含Spring MVC 框架相关的所有类。包括框架的Servlets，Web MVC框架，控制器和视图支持。当然，如果你的应用使用了独立的MVC 框架，则无需这个JAR 文件里的任何类。 外部依赖spring-web-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
Expand All @@ -130,21 +143,23 @@

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>

<!--这个jar 文件包含支持UI模版（Velocity，FreeMarker，JasperReports），邮件服务，脚本服务(JRuby)，缓存Cache（EHCache），任务计划Scheduling（uartz）方面的类。 外部依赖spring-context-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
Expand All @@ -156,6 +171,35 @@
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>

<!--下面两个提供对 AspectJ 的支持，是 spring-aspects 所需要依赖的-->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectjweaver.version}</version>
</dependency>

<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>${persistence-api.version}</version>
</dependency>

<!-- ############################################################### Spring 相关包 end ############################################################### -->


<!-- mybatis核心包 -->
<dependency>
<groupId>org.mybatis</groupId>
Expand All @@ -171,19 +215,6 @@
<version>${mybatis-spring.version}</version>
</dependency>

<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectjweaver.version}</version>
</dependency>

<!-- java ee jar 包 -->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee-api.version}</version>
<scope>provided</scope>
</dependency>

<!-- 导入Mysql数据库链接jar包 -->
<dependency>
Expand All @@ -207,7 +238,37 @@
<version>${jstl.version}</version>
</dependency>

<!-- 日志文件管理包 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>${jsp-api.version}</version>
<scope>provided</scope>
</dependency>

<!-- java ee jar 包 -->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee-api.version}</version>
<scope>provided</scope>
</dependency>

<!--单元测试-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<!-- 日志文件管理包 start -->
<!--下面这三个是配套使用：http://blog.csdn.net/woshiwxw765/article/details/7624556-->
<dependency>
<groupId>log4j</groupId>
Expand All @@ -226,6 +287,7 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- 日志文件管理包 end -->


<!--JSON处理-->
Expand Down Expand Up @@ -257,7 +319,6 @@
</dependency>



</dependencies>
<!--架包依赖 end-->

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/youmeek/ssm/module/user/controller/SysUserController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import javax.annotation.Resource;

@Controller
@RequestMapping("/userController")
@RequestMapping("/sysUserController")
public class SysUserController {
@Resource
private SysUserService sysUserService;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/youmeek/ssm/module/user/service/impl/SysUserServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ public class SysUserServiceImpl implements SysUserService {

@Override
public SysUser getById(Long id) {
return this.sysUserMapper.selectByPrimaryKey(id);
return sysUserMapper.selectByPrimaryKey(id);
}
}
28 changes: 28 additions & 0 deletions src/main/resources/log4j.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

#\u672C\u5C5E\u6027\u6587\u4EF6\u53EA\u80FD\u653E\u5728 resources \u6839\u76EE\u5F55\u4E0B

#\u540C\u65F6\u4F7F\u7528\u4E24\u79CD\u8BB0\u5F55,\u4E00\u79CD\u63A7\u5236\u53F0,\u4E00\u79CD\u6587\u4EF6\u65B9\u5F0F\uFF08\u6587\u4EF6\u5927\u5C0F\u5230\u8FBE\u6307\u5B9A\u5C3A\u5BF8\u7684\u65F6\u5019\u4EA7\u751F\u4E00\u4E2A\u65B0\u7684\u6587\u4EF6\uFF09
#log4j.rootLogger=trace,appenderNameConsole,appenderNameRollingFile

#\u53EA\u8F93\u51FA\u5230\u63A7\u5236\u53F0\uFF0C\u4E0D\u8F93\u51FA\u5230\u6587\u4EF6\uFF0C\u7EA7\u522B\uFF1Aall > trace > debug > info > warn > error
log4j.rootLogger=info,appenderNameConsole

#\u63A7\u5236\u53F0\u8F93\u51FA
log4j.appender.appenderNameConsole=org.apache.log4j.ConsoleAppender
log4j.appender.appenderNameConsole.Target=System.out
log4j.appender.appenderNameConsole.layout=org.apache.log4j.PatternLayout
log4j.appender.appenderNameConsole.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss:SSS}] --- [%p] --- [%F:%L] --- [%m] --- %n

#\u8FD9\u4E2A\u7528\u6765\u8F93\u51FAmybatis\u6267\u884Csql\u8BED\u53E5.\u5176\u4E2D com.youmeek.ssm.manage.mapper \u8868\u793Amapper.xml\u4E2D\u7684namespace,\u8FD9\u91CC\u53EA\u662F\u524D\u7F00\u8868\u793A\u6240\u6709\u8FD9\u4E2A\u524D\u7F00\u4E0B\u7684\u90FD\u8F93\u51FA,\u4E5F\u53EF\u4EE5\u5199\u5B8C\u6574namespace.
log4j.logger.com.youmeek.ssm.manage.mapper=debug

#======================================================
#\u8F93\u51FA\u65E5\u5FD7\u5230\u786C\u76D8\uFF0C\u6587\u4EF6\u5927\u5C0F\u5230\u8FBE\u6307\u5B9A\u5C3A\u5BF8\u7684\u65F6\u5019\u4EA7\u751F\u4E00\u4E2A\u65B0\u7684\u6587\u4EF6
#log4j.appender.appenderNameRollingFile=org.apache.log4j.RollingFileAppender
#log4j.appender.appenderNameRollingFile.File=log4j-log-out-file/ssm.log
#log4j.appender.appenderNameRollingFile.MaxFileSize=50MB
#log4j.appender.appenderNameRollingFile.Threshold=ALL
#log4j.appender.appenderNameRollingFile.layout=org.apache.log4j.PatternLayout
#log4j.appender.appenderNameRollingFile.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss:SSS}] --- [%p] --- [%F:%L] --- [%m] --- %n


21 changes: 0 additions & 21 deletions src/main/resources/properties/log4j.properties
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/spring/applicationContext-dataSource.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">

<!-- 使用阿里的druid配置数据源 start-->
<!--具体查看官网信息：https://github.com/alibaba/druid/wiki/%E9%85%8D%E7%BD%AE_DruidDataSource%E5%8F%82%E8%80%83%E9%85%8D%E7%BD%AE-->
<bean id="dataSource" name="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close">
<!--这三个变量读取config.properties的-->
<property name="url" value="${data_source_url}"/>
<property name="username" value="${data_source_username}"/>
Expand Down
Loading

0 comments on commit 5c43004

Please sign in to comment.