Skip to content
This repository was archived by the owner on Dec 25, 2019. It is now read-only.

Commit 84ab115

Browse files
committed
增加tomcat插件支持。
1 parent 5db2797 commit 84ab115

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>com.crossoverJie</groupId>
88
<artifactId>SSM</artifactId>
99
<packaging>war</packaging>
10-
<version>1.6</version>
10+
<version>1.6.1</version>
1111
<build>
1212
<plugins>
1313
<plugin>
@@ -18,9 +18,15 @@
1818
<target>1.6</target>
1919
</configuration>
2020
</plugin>
21+
<plugin>
22+
<groupId>org.apache.tomcat.maven</groupId>
23+
<artifactId>tomcat7-maven-plugin</artifactId>
24+
<version>2.2</version>
25+
</plugin>
2126
</plugins>
2227
</build>
2328

29+
2430
<properties>
2531
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2632
<spring.version>4.1.4.RELEASE</spring.version>

src/main/java/com/crossoverJie/controller/IndexController.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
package com.crossoverJie.controller;
22

3-
import com.fasterxml.jackson.databind.util.JSONPObject;
43
import com.crossoverJie.lucene.LuceneIndex;
54
import com.crossoverJie.pojo.Content;
65
import com.crossoverJie.pojo.PageEntity;
76
import com.crossoverJie.pojo.User;
87
import com.crossoverJie.service.ContentService;
98
import com.crossoverJie.service.IUserService;
109
import com.crossoverJie.util.CommonUtil;
11-
import com.crossoverJie.util.DateUtil;
1210
import com.crossoverJie.util.PageUtil;
13-
import com.crossoverJie.util.StringUtil;
14-
import com.fasterxml.jackson.databind.util.ObjectBuffer;
11+
import com.fasterxml.jackson.databind.util.JSONPObject;
1512
import net.sf.json.JSONObject;
1613
import org.springframework.stereotype.Controller;
1714
import org.springframework.ui.Model;
18-
import org.springframework.web.bind.annotation.*;
19-
import org.springframework.web.multipart.MultipartFile;
20-
import org.springframework.web.servlet.ModelAndView;
15+
import org.springframework.web.bind.annotation.RequestMapping;
16+
import org.springframework.web.bind.annotation.RequestMethod;
17+
import org.springframework.web.bind.annotation.RequestParam;
18+
import org.springframework.web.bind.annotation.ResponseBody;
2119

2220
import javax.annotation.Resource;
2321
import javax.servlet.http.HttpServletRequest;
2422
import javax.servlet.http.HttpServletResponse;
25-
import java.io.File;
2623
import java.io.IOException;
2724
import java.util.HashMap;
2825
import java.util.List;
@@ -51,6 +48,8 @@ public String index(@RequestParam(value = "page", required = false, defaultValue
5148
model.addAttribute("users", users);
5249
StringBuffer param = new StringBuffer();
5350

51+
52+
5453
String pageHtml = PageUtil.genPagination(request.getContextPath() + "/index", total, page, 10, param.toString());
5554
model.addAttribute("pageHtml", pageHtml);
5655
return "index";

0 commit comments

Comments
 (0)