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

Commit

Permalink
增加tomcat插件支持。
Browse files Browse the repository at this point in the history
  • Loading branch information
crossoverJie committed Nov 12, 2016
1 parent 5db2797 commit 84ab115
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.crossoverJie</groupId>
<artifactId>SSM</artifactId>
<packaging>war</packaging>
<version>1.6</version>
<version>1.6.1</version>
<build>
<plugins>
<plugin>
Expand All @@ -18,9 +18,15 @@
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
</plugins>
</build>


<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>4.1.4.RELEASE</spring.version>
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/crossoverJie/controller/IndexController.java
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
package com.crossoverJie.controller;

import com.fasterxml.jackson.databind.util.JSONPObject;
import com.crossoverJie.lucene.LuceneIndex;
import com.crossoverJie.pojo.Content;
import com.crossoverJie.pojo.PageEntity;
import com.crossoverJie.pojo.User;
import com.crossoverJie.service.ContentService;
import com.crossoverJie.service.IUserService;
import com.crossoverJie.util.CommonUtil;
import com.crossoverJie.util.DateUtil;
import com.crossoverJie.util.PageUtil;
import com.crossoverJie.util.StringUtil;
import com.fasterxml.jackson.databind.util.ObjectBuffer;
import com.fasterxml.jackson.databind.util.JSONPObject;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -51,6 +48,8 @@ public String index(@RequestParam(value = "page", required = false, defaultValue
model.addAttribute("users", users);
StringBuffer param = new StringBuffer();



String pageHtml = PageUtil.genPagination(request.getContextPath() + "/index", total, page, 10, param.toString());
model.addAttribute("pageHtml", pageHtml);
return "index";
Expand Down

0 comments on commit 84ab115

Please sign in to comment.