diff --git a/src/main/java/com/how2java/tmall/controller/ProductController.java b/src/main/java/com/how2java/tmall/controller/ProductController.java
index 5d2f424..6b13701 100644
--- a/src/main/java/com/how2java/tmall/controller/ProductController.java
+++ b/src/main/java/com/how2java/tmall/controller/ProductController.java
@@ -1,3 +1,78 @@
   	
+  	
 
 package com.how2java.tmall.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.how2java.tmall.pojo.Category;
+import com.how2java.tmall.pojo.Product;
+import com.how2java.tmall.service.CategoryService;
+import com.how2java.tmall.service.ProductService;
+import com.how2java.tmall.util.Page;
+
+@Controller
+@RequestMapping("")
+public class ProductController {
+    @Autowired
+    CategoryService categoryService;
+    @Autowired
+    ProductService productService;
+
+    @RequestMapping("admin_product_add")
+    public String add(Model model, Product p) {
+        productService.add(p);
+        return "redirect:admin_product_list?cid="+p.getCid();
+    }
+
+    @RequestMapping("admin_product_delete")
+    public String delete(int id) {
+        Product p = productService.get(id);
+        productService.delete(id);
+        return "redirect:admin_product_list?cid="+p.getCid();
+    }
+
+    @RequestMapping("admin_product_edit")
+    public String edit(Model model, int id) {
+        Product p = productService.get(id);
+        Category c = categoryService.get(p.getCid());
+        p.setCategory(c);
+        model.addAttribute("p", p);
+        return "admin/editProduct";
+    }
+
+    @RequestMapping("admin_product_update")
+    public String update(Product p) {
+        productService.update(p);
+        return "redirect:admin_product_list?cid="+p.getCid();
+    }
+
+    @RequestMapping("admin_product_list")
+    public String list(int cid, Model model, Page page) {
+        Category c = categoryService.get(cid);
+
+        PageHelper.offsetPage(page.getStart(),page.getCount());
+        List<Product> ps = productService.list(cid);
+
+        int total = (int) new PageInfo<>(ps).getTotal();
+        page.setTotal(total);
+        page.setParam("&cid="+c.getId());
+
+        model.addAttribute("ps", ps);
+        model.addAttribute("c", c);
+        model.addAttribute("page", page);
+
+        return "admin/listProduct";
+    }
+}
+
+