本地redis

src/main/java/com/thinkgem/jeesite/test/web/TestDataController.java

@@ -1,83 +1,83 @@
-/**
- * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.thinkgem.jeesite.test.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.test.entity.TestData;
-import com.thinkgem.jeesite.test.service.TestDataService;
-
-/**
- * 单表生成Controller
- * @author ThinkGem
- * @version 2015-04-06
- */
-@Controller
-@RequestMapping(value = "${adminPath}/test/testData")
-public class TestDataController extends BaseController {
-
-	@Autowired
-	private TestDataService testDataService;
-	
-	@ModelAttribute
-	public TestData get(@RequestParam(required=false) String id) {
-		TestData entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = testDataService.get(id);
-		}
-		if (entity == null){
-			entity = new TestData();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(TestData testData, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<TestData> page = testDataService.findPage(new Page<TestData>(request, response), testData); 
-		model.addAttribute("page", page);
-		return "jeesite/test/testDataList";
-	}
-
-	@RequiresPermissions("test:testData:view")
-	@RequestMapping(value = "form")
-	public String form(TestData testData, Model model) {
-		model.addAttribute("testData", testData);
-		return "jeesite/test/testDataForm";
-	}
-
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "save")
-	public String save(TestData testData, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, testData)){
-			return form(testData, model);
-		}
-		testDataService.save(testData);
-		addMessage(redirectAttributes, "保存单表成功");
-		return "redirect:"+Global.getAdminPath()+"/test/testData/?repage";
-	}
-	
-	@RequiresPermissions("test:testData:edit")
-	@RequestMapping(value = "delete")
-	public String delete(TestData testData, RedirectAttributes redirectAttributes) {
-		testDataService.delete(testData);
-		addMessage(redirectAttributes, "删除单表成功");
-		return "redirect:"+Global.getAdminPath()+"/test/testData/?repage";
-	}
-
-}
+///**
+// * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+// */
+//package com.thinkgem.jeesite.test.web;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//import org.apache.shiro.authz.annotation.RequiresPermissions;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.ModelAttribute;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+//
+//import com.thinkgem.jeesite.common.config.Global;
+//import com.thinkgem.jeesite.common.persistence.Page;
+//import com.thinkgem.jeesite.common.web.BaseController;
+//import com.thinkgem.jeesite.common.utils.StringUtils;
+//import com.thinkgem.jeesite.test.entity.TestData;
+//import com.thinkgem.jeesite.test.service.TestDataService;
+//
+///**
+// * 单表生成Controller
+// * @author ThinkGem
+// * @version 2015-04-06
+// */
+//@Controller
+//@RequestMapping(value = "${adminPath}/test/testData")
+//public class TestDataController extends BaseController {
+//
+//	@Autowired
+//	private TestDataService testDataService;
+//
+//	@ModelAttribute
+//	public TestData get(@RequestParam(required=false) String id) {
+//		TestData entity = null;
+//		if (StringUtils.isNotBlank(id)){
+//			entity = testDataService.get(id);
+//		}
+//		if (entity == null){
+//			entity = new TestData();
+//		}
+//		return entity;
+//	}
+//
+//	@RequiresPermissions("test:testData:view")
+//	@RequestMapping(value = {"list", ""})
+//	public String list(TestData testData, HttpServletRequest request, HttpServletResponse response, Model model) {
+//		Page<TestData> page = testDataService.findPage(new Page<TestData>(request, response), testData);
+//		model.addAttribute("page", page);
+//		return "jeesite/test/testDataList";
+//	}
+//
+//	@RequiresPermissions("test:testData:view")
+//	@RequestMapping(value = "form")
+//	public String form(TestData testData, Model model) {
+//		model.addAttribute("testData", testData);
+//		return "jeesite/test/testDataForm";
+//	}
+//
+//	@RequiresPermissions("test:testData:edit")
+//	@RequestMapping(value = "save")
+//	public String save(TestData testData, Model model, RedirectAttributes redirectAttributes) {
+//		if (!beanValidator(model, testData)){
+//			return form(testData, model);
+//		}
+//		testDataService.save(testData);
+//		addMessage(redirectAttributes, "保存单表成功");
+//		return "redirect:"+Global.getAdminPath()+"/test/testData/?repage";
+//	}
+//
+//	@RequiresPermissions("test:testData:edit")
+//	@RequestMapping(value = "delete")
+//	public String delete(TestData testData, RedirectAttributes redirectAttributes) {
+//		testDataService.delete(testData);
+//		addMessage(redirectAttributes, "删除单表成功");
+//		return "redirect:"+Global.getAdminPath()+"/test/testData/?repage";
+//	}
+//
+//}

src/main/java/com/thinkgem/jeesite/test/web/TestDataMainController.java

@@ -1,83 +1,83 @@
-/**
- * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.thinkgem.jeesite.test.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.test.entity.TestDataMain;
-import com.thinkgem.jeesite.test.service.TestDataMainService;
-
-/**
- * 主子表生成Controller
- * @author ThinkGem
- * @version 2015-04-06
- */
-@Controller
-@RequestMapping(value = "${adminPath}/test/testDataMain")
-public class TestDataMainController extends BaseController {
-
-	@Autowired
-	private TestDataMainService testDataMainService;
-	
-	@ModelAttribute
-	public TestDataMain get(@RequestParam(required=false) String id) {
-		TestDataMain entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = testDataMainService.get(id);
-		}
-		if (entity == null){
-			entity = new TestDataMain();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("test:testDataMain:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<TestDataMain> page = testDataMainService.findPage(new Page<TestDataMain>(request, response), testDataMain); 
-		model.addAttribute("page", page);
-		return "jeesite/test/testDataMainList";
-	}
-
-	@RequiresPermissions("test:testDataMain:view")
-	@RequestMapping(value = "form")
-	public String form(TestDataMain testDataMain, Model model) {
-		model.addAttribute("testDataMain", testDataMain);
-		return "jeesite/test/testDataMainForm";
-	}
-
-	@RequiresPermissions("test:testDataMain:edit")
-	@RequestMapping(value = "save")
-	public String save(TestDataMain testDataMain, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, testDataMain)){
-			return form(testDataMain, model);
-		}
-		testDataMainService.save(testDataMain);
-		addMessage(redirectAttributes, "保存主子表成功");
-		return "redirect:"+Global.getAdminPath()+"/test/testDataMain/?repage";
-	}
-	
-	@RequiresPermissions("test:testDataMain:edit")
-	@RequestMapping(value = "delete")
-	public String delete(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
-		testDataMainService.delete(testDataMain);
-		addMessage(redirectAttributes, "删除主子表成功");
-		return "redirect:"+Global.getAdminPath()+"/test/testDataMain/?repage";
-	}
-
-}
+///**
+// * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+// */
+//package com.thinkgem.jeesite.test.web;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//import org.apache.shiro.authz.annotation.RequiresPermissions;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.ModelAttribute;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+//
+//import com.thinkgem.jeesite.common.config.Global;
+//import com.thinkgem.jeesite.common.persistence.Page;
+//import com.thinkgem.jeesite.common.web.BaseController;
+//import com.thinkgem.jeesite.common.utils.StringUtils;
+//import com.thinkgem.jeesite.test.entity.TestDataMain;
+//import com.thinkgem.jeesite.test.service.TestDataMainService;
+//
+///**
+// * 主子表生成Controller
+// * @author ThinkGem
+// * @version 2015-04-06
+// */
+//@Controller
+//@RequestMapping(value = "${adminPath}/test/testDataMain")
+//public class TestDataMainController extends BaseController {
+//
+//	@Autowired
+//	private TestDataMainService testDataMainService;
+//
+//	@ModelAttribute
+//	public TestDataMain get(@RequestParam(required=false) String id) {
+//		TestDataMain entity = null;
+//		if (StringUtils.isNotBlank(id)){
+//			entity = testDataMainService.get(id);
+//		}
+//		if (entity == null){
+//			entity = new TestDataMain();
+//		}
+//		return entity;
+//	}
+//
+//	@RequiresPermissions("test:testDataMain:view")
+//	@RequestMapping(value = {"list", ""})
+//	public String list(TestDataMain testDataMain, HttpServletRequest request, HttpServletResponse response, Model model) {
+//		Page<TestDataMain> page = testDataMainService.findPage(new Page<TestDataMain>(request, response), testDataMain);
+//		model.addAttribute("page", page);
+//		return "jeesite/test/testDataMainList";
+//	}
+//
+//	@RequiresPermissions("test:testDataMain:view")
+//	@RequestMapping(value = "form")
+//	public String form(TestDataMain testDataMain, Model model) {
+//		model.addAttribute("testDataMain", testDataMain);
+//		return "jeesite/test/testDataMainForm";
+//	}
+//
+//	@RequiresPermissions("test:testDataMain:edit")
+//	@RequestMapping(value = "save")
+//	public String save(TestDataMain testDataMain, Model model, RedirectAttributes redirectAttributes) {
+//		if (!beanValidator(model, testDataMain)){
+//			return form(testDataMain, model);
+//		}
+//		testDataMainService.save(testDataMain);
+//		addMessage(redirectAttributes, "保存主子表成功");
+//		return "redirect:"+Global.getAdminPath()+"/test/testDataMain/?repage";
+//	}
+//
+//	@RequiresPermissions("test:testDataMain:edit")
+//	@RequestMapping(value = "delete")
+//	public String delete(TestDataMain testDataMain, RedirectAttributes redirectAttributes) {
+//		testDataMainService.delete(testDataMain);
+//		addMessage(redirectAttributes, "删除主子表成功");
+//		return "redirect:"+Global.getAdminPath()+"/test/testDataMain/?repage";
+//	}
+//
+//}

src/main/java/com/thinkgem/jeesite/test/web/TestTreeController.java

@@ -1,125 +1,125 @@
-/**
- * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.thinkgem.jeesite.test.web;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.test.entity.TestTree;
-import com.thinkgem.jeesite.test.service.TestTreeService;
-
-/**
- * 树结构生成Controller
- * @author ThinkGem
- * @version 2015-04-06
- */
-@Controller
-@RequestMapping(value = "${adminPath}/test/testTree")
-public class TestTreeController extends BaseController {
-
-	@Autowired
-	private TestTreeService testTreeService;
-	
-	@ModelAttribute
-	public TestTree get(@RequestParam(required=false) String id) {
-		TestTree entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = testTreeService.get(id);
-		}
-		if (entity == null){
-			entity = new TestTree();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(TestTree testTree, HttpServletRequest request, HttpServletResponse response, Model model) {
-		List<TestTree> list = testTreeService.findList(testTree); 
-		model.addAttribute("list", list);
-		return "jeesite/test/testTreeList";
-	}
-
-	@RequiresPermissions("test:testTree:view")
-	@RequestMapping(value = "form")
-	public String form(TestTree testTree, Model model) {
-		if (testTree.getParent()!=null && StringUtils.isNotBlank(testTree.getParent().getId())){
-			testTree.setParent(testTreeService.get(testTree.getParent().getId()));
-			// 获取排序号，最末节点排序号+30
-			if (StringUtils.isBlank(testTree.getId())){
-				TestTree testTreeChild = new TestTree();
-				testTreeChild.setParent(new TestTree(testTree.getParent().getId()));
-				List<TestTree> list = testTreeService.findList(testTree); 
-				if (list.size() > 0){
-					testTree.setSort(list.get(list.size()-1).getSort());
-					if (testTree.getSort() != null){
-						testTree.setSort(testTree.getSort() + 30);
-					}
-				}
-			}
-		}
-		if (testTree.getSort() == null){
-			testTree.setSort(30);
-		}
-		model.addAttribute("testTree", testTree);
-		return "jeesite/test/testTreeForm";
-	}
-
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "save")
-	public String save(TestTree testTree, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, testTree)){
-			return form(testTree, model);
-		}
-		testTreeService.save(testTree);
-		addMessage(redirectAttributes, "保存树结构成功");
-		return "redirect:"+Global.getAdminPath()+"/test/testTree/?repage";
-	}
-	
-	@RequiresPermissions("test:testTree:edit")
-	@RequestMapping(value = "delete")
-	public String delete(TestTree testTree, RedirectAttributes redirectAttributes) {
-		testTreeService.delete(testTree);
-		addMessage(redirectAttributes, "删除树结构成功");
-		return "redirect:"+Global.getAdminPath()+"/test/testTree/?repage";
-	}
-
-	@RequiresPermissions("user")
-	@ResponseBody
-	@RequestMapping(value = "treeData")
-	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId, HttpServletResponse response) {
-		List<Map<String, Object>> mapList = Lists.newArrayList();
-		List<TestTree> list = testTreeService.findList(new TestTree());
-		for (int i=0; i<list.size(); i++){
-			TestTree e = list.get(i);
-			if (StringUtils.isBlank(extId) || (extId!=null && !extId.equals(e.getId()) && e.getParentIds().indexOf(","+extId+",")==-1)){
-				Map<String, Object> map = Maps.newHashMap();
-				map.put("id", e.getId());
-				map.put("pId", e.getParentId());
-				map.put("name", e.getName());
-				mapList.add(map);
-			}
-		}
-		return mapList;
-	}
-	
-}
+///**
+// * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+// */
+//package com.thinkgem.jeesite.test.web;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//import org.apache.shiro.authz.annotation.RequiresPermissions;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.Model;
+//import org.springframework.web.bind.annotation.ModelAttribute;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.ResponseBody;
+//import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+//
+//import com.google.common.collect.Lists;
+//import com.google.common.collect.Maps;
+//import com.thinkgem.jeesite.common.config.Global;
+//import com.thinkgem.jeesite.common.web.BaseController;
+//import com.thinkgem.jeesite.common.utils.StringUtils;
+//import com.thinkgem.jeesite.test.entity.TestTree;
+//import com.thinkgem.jeesite.test.service.TestTreeService;
+//
+///**
+// * 树结构生成Controller
+// * @author ThinkGem
+// * @version 2015-04-06
+// */
+//@Controller
+//@RequestMapping(value = "${adminPath}/test/testTree")
+//public class TestTreeController extends BaseController {
+//
+//	@Autowired
+//	private TestTreeService testTreeService;
+//
+//	@ModelAttribute
+//	public TestTree get(@RequestParam(required=false) String id) {
+//		TestTree entity = null;
+//		if (StringUtils.isNotBlank(id)){
+//			entity = testTreeService.get(id);
+//		}
+//		if (entity == null){
+//			entity = new TestTree();
+//		}
+//		return entity;
+//	}
+//
+//	@RequiresPermissions("test:testTree:view")
+//	@RequestMapping(value = {"list", ""})
+//	public String list(TestTree testTree, HttpServletRequest request, HttpServletResponse response, Model model) {
+//		List<TestTree> list = testTreeService.findList(testTree);
+//		model.addAttribute("list", list);
+//		return "jeesite/test/testTreeList";
+//	}
+//
+//	@RequiresPermissions("test:testTree:view")
+//	@RequestMapping(value = "form")
+//	public String form(TestTree testTree, Model model) {
+//		if (testTree.getParent()!=null && StringUtils.isNotBlank(testTree.getParent().getId())){
+//			testTree.setParent(testTreeService.get(testTree.getParent().getId()));
+//			// 获取排序号，最末节点排序号+30
+//			if (StringUtils.isBlank(testTree.getId())){
+//				TestTree testTreeChild = new TestTree();
+//				testTreeChild.setParent(new TestTree(testTree.getParent().getId()));
+//				List<TestTree> list = testTreeService.findList(testTree);
+//				if (list.size() > 0){
+//					testTree.setSort(list.get(list.size()-1).getSort());
+//					if (testTree.getSort() != null){
+//						testTree.setSort(testTree.getSort() + 30);
+//					}
+//				}
+//			}
+//		}
+//		if (testTree.getSort() == null){
+//			testTree.setSort(30);
+//		}
+//		model.addAttribute("testTree", testTree);
+//		return "jeesite/test/testTreeForm";
+//	}
+//
+//	@RequiresPermissions("test:testTree:edit")
+//	@RequestMapping(value = "save")
+//	public String save(TestTree testTree, Model model, RedirectAttributes redirectAttributes) {
+//		if (!beanValidator(model, testTree)){
+//			return form(testTree, model);
+//		}
+//		testTreeService.save(testTree);
+//		addMessage(redirectAttributes, "保存树结构成功");
+//		return "redirect:"+Global.getAdminPath()+"/test/testTree/?repage";
+//	}
+//
+//	@RequiresPermissions("test:testTree:edit")
+//	@RequestMapping(value = "delete")
+//	public String delete(TestTree testTree, RedirectAttributes redirectAttributes) {
+//		testTreeService.delete(testTree);
+//		addMessage(redirectAttributes, "删除树结构成功");
+//		return "redirect:"+Global.getAdminPath()+"/test/testTree/?repage";
+//	}
+//
+//	@RequiresPermissions("user")
+//	@ResponseBody
+//	@RequestMapping(value = "treeData")
+//	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId, HttpServletResponse response) {
+//		List<Map<String, Object>> mapList = Lists.newArrayList();
+//		List<TestTree> list = testTreeService.findList(new TestTree());
+//		for (int i=0; i<list.size(); i++){
+//			TestTree e = list.get(i);
+//			if (StringUtils.isBlank(extId) || (extId!=null && !extId.equals(e.getId()) && e.getParentIds().indexOf(","+extId+",")==-1)){
+//				Map<String, Object> map = Maps.newHashMap();
+//				map.put("id", e.getId());
+//				map.put("pId", e.getParentId());
+//				map.put("name", e.getName());
+//				mapList.add(map);
+//			}
+//		}
+//		return mapList;
+//	}
+//
+//}

src/main/resources/config/dev/caimei.properties

@@ -41,9 +41,9 @@ jdbc.testSql=SELECT 'x' FROM DUAL
 
 #redis settings
 redis.keyPrefix=caimei-manager
-redis.host=119.29.0.46
-redis.port=6380
-redis.pass=6#xsI%b4o@5c3RoE
+redis.host=192.168.2.100
+redis.port=6379
+redis.pass=123456
 redis.timeout=100000
 #\u6700\u5927\u8FDE\u63A5\u6570
 redis.pool.maxActive=300