Skip to content

Commit 71aff35

Browse files
committed
SSM模块改造
1 parent 7e4849b commit 71aff35

File tree

21 files changed

+522
-474
lines changed

21 files changed

+522
-474
lines changed

Pay-Demo/src/main/java/cn/mrdear/pay/unionpay/UnionPayTrade.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.util.Map;
88

9-
import javax.servlet.http.HttpServletRequest;
109

1110
import cn.mrdear.pay.unionpay.sdk.AcpService;
1211
import cn.mrdear.pay.util.SignUtil;

SSM--Demo/Freemarker.iml renamed to SSM--Demo/SSM--Demo.iml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,32 @@
99
<webroots>
1010
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
1111
</webroots>
12-
<sourceRoots>
13-
<root url="file://$MODULE_DIR$/src/main/java" />
14-
<root url="file://$MODULE_DIR$/src/main/resources" />
15-
</sourceRoots>
1612
</configuration>
1713
</facet>
1814
<facet type="Spring" name="Spring">
19-
<configuration>
20-
<fileset id="fileset" name="Spring Application Context" removed="false">
21-
<file>file://$MODULE_DIR$/src/main/resources/spring/dispatcher-servlet.xml</file>
22-
<file>file://$MODULE_DIR$/src/main/resources/spring/applicationContext.xml</file>
23-
</fileset>
24-
</configuration>
15+
<configuration />
2516
</facet>
2617
</component>
2718
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
2819
<output url="file://$MODULE_DIR$/target/classes" />
2920
<output-test url="file://$MODULE_DIR$/target/test-classes" />
3021
<content url="file://$MODULE_DIR$">
31-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
3222
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
33-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
23+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
3524
<excludeFolder url="file://$MODULE_DIR$/target" />
3625
</content>
3726
<orderEntry type="inheritedJdk" />
3827
<orderEntry type="sourceFolder" forTests="false" />
39-
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
40-
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
41-
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
28+
<orderEntry type="library" scope="PROVIDED" name="Tomcat 8.0.30" level="application_server_libraries" />
29+
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
4230
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
4331
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
4432
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
33+
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
4534
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
35+
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
4636
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
4737
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
48-
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
4938
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
5039
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
5140
<orderEntry type="library" name="Maven: cglib:cglib:3.2.2" level="project" />
@@ -60,14 +49,15 @@
6049
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
6150
<orderEntry type="library" name="Maven: org.mybatis:mybatis-ehcache:1.0.0" level="project" />
6251
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
63-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
6452
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
53+
<orderEntry type="library" name="Maven: tk.mybatis:mapper:3.3.9" level="project" />
54+
<orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0.2" level="project" />
6555
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
6656
<orderEntry type="library" name="Maven: com.alibaba:druid:1.0.25" level="project" />
6757
<orderEntry type="module-library">
6858
<library name="Maven: com.alibaba:jconsole:1.8.0">
6959
<CLASSES>
70-
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/jconsole.jar!/" />
60+
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/lib/jconsole.jar!/" />
7161
</CLASSES>
7262
<JAVADOC />
7363
<SOURCES />
@@ -76,7 +66,7 @@
7666
<orderEntry type="module-library">
7767
<library name="Maven: com.alibaba:tools:1.8.0">
7868
<CLASSES>
79-
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/jre/../lib/tools.jar!/" />
69+
<root url="jar://C:/Program Files/Java/jdk1.8.0_77/lib/tools.jar!/" />
8070
</CLASSES>
8171
<JAVADOC />
8272
<SOURCES />
@@ -89,9 +79,11 @@
8979
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
9080
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
9181
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
82+
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
9283
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
9384
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
9485
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
86+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
9587
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
9688
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
9789
<orderEntry type="library" name="Maven: org.logback-extensions:logback-ext-spring:0.1.4" level="project" />

SSM--Demo/pom.xml

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,27 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>cn.mrdear</groupId>
5-
<artifactId>mrdear</artifactId>
5+
<artifactId>SSM-Demo</artifactId>
66
<packaging>war</packaging>
77
<version>1.0.0</version>
88
<name>mrdear Maven Webapp</name>
99
<url>http://maven.apache.org</url>
10+
1011
<properties>
1112
<spring.version>4.3.2.RELEASE</spring.version>
1213
<mybatis.version>3.4.1</mybatis.version>
1314
<mybatis.spring>1.3.0</mybatis.spring>
1415
<mybatis.pagehelper>4.1.6</mybatis.pagehelper>
16+
<mybatis.mapper>3.3.9</mybatis.mapper>
1517
<ehcache.version>2.6.11</ehcache.version>
1618
<ehcache.web>2.0.4</ehcache.web>
1719
<ehcache.mybatis>1.0.0</ehcache.mybatis>
18-
<thymeleaf.version>3.0.1.RELEASE</thymeleaf.version>
19-
<shiro.version>1.3.0</shiro.version>
2020
<hibernate.validator>5.2.4.Final</hibernate.validator>
2121
<druid.version>1.0.25</druid.version>
2222
<fastjson.version>1.2.16</fastjson.version>
2323
<mysql.version>5.1.39</mysql.version>
2424
<slf4j.version>1.7.21</slf4j.version>
2525
<logback.version>1.1.7</logback.version>
26-
<guava.version>19.0</guava.version>
2726
<httpclient.version>4.5.2</httpclient.version>
2827
<commonlang.version>3.4</commonlang.version>
2928
<commonbean.version>1.9.2</commonbean.version>
@@ -34,35 +33,16 @@
3433
</properties>
3534

3635
<dependencies>
36+
3737
<!-- springframe start -->
38-
<dependency>
39-
<groupId>org.springframework</groupId>
40-
<artifactId>spring-core</artifactId>
41-
<version>${spring.version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.springframework</groupId>
45-
<artifactId>spring-web</artifactId>
46-
<version>${spring.version}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.springframework</groupId>
50-
<artifactId>spring-jdbc</artifactId>
51-
<version>${spring.version}</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.springframework</groupId>
55-
<artifactId>spring-tx</artifactId>
56-
<version>${spring.version}</version>
57-
</dependency>
5838
<dependency>
5939
<groupId>org.springframework</groupId>
6040
<artifactId>spring-webmvc</artifactId>
6141
<version>${spring.version}</version>
6242
</dependency>
6343
<dependency>
6444
<groupId>org.springframework</groupId>
65-
<artifactId>spring-aop</artifactId>
45+
<artifactId>spring-jdbc</artifactId>
6646
<version>${spring.version}</version>
6747
</dependency>
6848
<dependency>
@@ -75,7 +55,6 @@
7555
<artifactId>spring-test</artifactId>
7656
<version>${spring.version}</version>
7757
</dependency>
78-
<!-- springframe end -->
7958
<!--cglib动态代理-->
8059
<dependency>
8160
<groupId>cglib</groupId>
@@ -93,7 +72,6 @@
9372
<artifactId>aspectjrt</artifactId>
9473
<version>1.8.6</version>
9574
</dependency>
96-
9775
<!--mybatis start-->
9876
<dependency>
9977
<groupId>org.mybatis</groupId>
@@ -125,35 +103,42 @@
125103
<artifactId>ehcache-web</artifactId>
126104
<version>${ehcache.web}</version>
127105
</dependency>
128-
<!--mybatis end-->
106+
<!--通用mapper-->
107+
<dependency>
108+
<groupId>tk.mybatis</groupId>
109+
<artifactId>mapper</artifactId>
110+
<version>${mybatis.mapper}</version>
111+
</dependency>
112+
<!--给通用mapper提供注解 start-->
113+
<dependency>
114+
<groupId>javax.persistence</groupId>
115+
<artifactId>persistence-api</artifactId>
116+
<version>1.0.2</version>
117+
</dependency>
129118
<!--mysql start-->
130119
<dependency>
131120
<groupId>mysql</groupId>
132121
<artifactId>mysql-connector-java</artifactId>
133122
<version>${mysql.version}</version>
134123
</dependency>
135-
<!--mysql end-->
136124
<!--druid -start-->
137125
<dependency>
138126
<groupId>com.alibaba</groupId>
139127
<artifactId>druid</artifactId>
140128
<version>${druid.version}</version>
141129
</dependency>
142-
<!--druid -end-->
143130
<!--fastjson start-->
144131
<dependency>
145132
<groupId>com.alibaba</groupId>
146133
<artifactId>fastjson</artifactId>
147134
<version>${fastjson.version}</version>
148135
</dependency>
149-
<!--fastjson end-->
150136
<!--hibervate validate start-->
151137
<dependency>
152138
<groupId>org.hibernate</groupId>
153139
<artifactId>hibernate-validator</artifactId>
154140
<version>${hibernate.validator}</version>
155141
</dependency>
156-
<!--hibervate validate end-->
157142
<!--commons start -->
158143
<dependency>
159144
<groupId>org.apache.commons</groupId>
@@ -175,7 +160,6 @@
175160
<artifactId>commons-fileupload</artifactId>
176161
<version>${commonfile.version}</version>
177162
</dependency>
178-
<!--commons end -->
179163
<!--log start-->
180164
<dependency>
181165
<groupId>org.slf4j</groupId>
@@ -202,12 +186,37 @@
202186
<artifactId>jcl-over-slf4j</artifactId>
203187
<version>${slf4j.jcl.version}</version>
204188
</dependency>
205-
<!--log end-->
206189
</dependencies>
207190

208191
<build>
209-
<pluginManagement>
192+
193+
<finalName>ssm</finalName>
194+
210195
<plugins>
196+
<!--通用mapper插件-->
197+
<plugin>
198+
<groupId>org.mybatis.generator</groupId>
199+
<artifactId>mybatis-generator-maven-plugin</artifactId>
200+
<version>1.3.2</version>
201+
<configuration>
202+
<configurationFile>../SSM--Demo/src/main/resources/ModelGenerator.xml</configurationFile>
203+
<overwrite>true</overwrite>
204+
<verbose>true</verbose>
205+
</configuration>
206+
<dependencies>
207+
<dependency>
208+
<groupId>mysql</groupId>
209+
<artifactId>mysql-connector-java</artifactId>
210+
<version>5.1.39</version>
211+
</dependency>
212+
<dependency>
213+
<groupId>tk.mybatis</groupId>
214+
<artifactId>mapper</artifactId>
215+
<version>3.3.9</version>
216+
</dependency>
217+
</dependencies>
218+
</plugin>
219+
<!--编译插件设为1.8-->
211220
<plugin>
212221
<groupId>org.apache.maven.plugins</groupId>
213222
<artifactId>maven-compiler-plugin</artifactId>
@@ -218,6 +227,5 @@
218227
</configuration>
219228
</plugin>
220229
</plugins>
221-
</pluginManagement>
222230
</build>
223231
</project>

SSM--Demo/src/main/java/cn/mrdear/controller/CacheTest.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33
import com.alibaba.fastjson.JSONObject;
44

55
import org.springframework.web.bind.annotation.RequestMapping;
6+
import org.springframework.web.bind.annotation.ResponseBody;
67
import org.springframework.web.bind.annotation.RestController;
78

9+
import java.util.List;
10+
811
import javax.annotation.Resource;
912

13+
import cn.mrdear.entity.Book;
14+
import cn.mrdear.mapper.BookMapper;
1015
import cn.mrdear.service.CacheTestService;
1116

1217
/**
@@ -16,13 +21,12 @@
1621
@RestController
1722
public class CacheTest {
1823
@Resource
19-
private CacheTestService CacheTestService;
24+
private BookMapper bookMapper;
2025

21-
@RequestMapping(value = "/test")
22-
public JSONObject test(int id){
23-
JSONObject object = CacheTestService.getjson(id);
24-
JSONObject object1 = CacheTestService.getjson(id);
25-
System.out.println(object == object1);
26-
return CacheTestService.getjson(id);
26+
@RequestMapping(value = "/books")
27+
@ResponseBody
28+
public List<Book> test(){
29+
List<Book> books = bookMapper.selectAll();
30+
return books;
2731
}
2832
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package cn.mrdear.entity;
2+
3+
import java.util.Date;
4+
import javax.persistence.*;
5+
6+
@Table(name = "appointment")
7+
public class Appointment extends AppointmentKey {
8+
/**
9+
* 预约时间
10+
*/
11+
@Column(name = "appoint_time")
12+
private Date appointTime;
13+
14+
/**
15+
* 获取预约时间
16+
*
17+
* @return appoint_time - 预约时间
18+
*/
19+
public Date getAppointTime() {
20+
return appointTime;
21+
}
22+
23+
/**
24+
* 设置预约时间
25+
*
26+
* @param appointTime 预约时间
27+
*/
28+
public void setAppointTime(Date appointTime) {
29+
this.appointTime = appointTime;
30+
}
31+
}

0 commit comments

Comments
 (0)