Merge remote-tracking branch 'remotes/origin/developer' into developerB

# Conflicts:
#	src/main/resources/config/dev/caimei.properties

src/main/java/com/caimei/modules/cmpage/web/CmPageCentreController.java

@@ -5,6 +5,7 @@ import com.caimei.modules.cmpage.entity.CmPageCentre;
 import com.caimei.modules.cmpage.service.CmImageService;
 import com.caimei.modules.cmpage.service.CmPageCentreService;
 import com.caimei.modules.newhome.entity.NewPageFloorContent;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.modules.product.entity.ActType;
 import com.caimei.modules.product.service.ActTypeService;
 import com.caimei.redis.RedisService;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -51,6 +53,8 @@ public class CmPageCentreController extends BaseController {
 
     @Autowired
     private RedisService redisService;
+    @Resource
+    private GenerateUtils generateUtils;
 
     @ModelAttribute
     public CmPageCentre get(@RequestParam(required = false) String id) {
@@ -109,7 +113,7 @@ public class CmPageCentreController extends BaseController {
         addMessage(redirectAttributes, "保存成功");
         if ("5".equals(cmPageCentre.getType())) {
             //清除产品仪器缓存
-            redisService.removePattern("instrumentData*");redisService.removePattern("insCommodityData*");
+            cleanRedisCache();
         } else if ("6".equals(cmPageCentre.getType())) {
             //清除活动专题缓存
             redisService.removePattern("activityData*");
@@ -121,6 +125,10 @@ public class CmPageCentreController extends BaseController {
     @RequestMapping(value = "delete")
     public String delete(CmPageCentre cmPageCentre, RedirectAttributes redirectAttributes) {
         cmPageCentreService.delete(cmPageCentre);
+        if ("5".equals(cmPageCentre.getType())) {
+            //清除产品仪器缓存
+            cleanRedisCache();
+        }
         if ("6".equals(cmPageCentre.getType())) {
             //清除活动专题缓存
             redisService.removePattern("activityData*");
@@ -138,6 +146,7 @@ public class CmPageCentreController extends BaseController {
             cmPageCentreService.updateEnabledStatusByIds(enabledStatus, ids);
             map.put("success", true);
             map.put("msg", "修改成功");
+            cleanRedisCache();
         } catch (Exception e) {
             logger.debug(e.toString(), e);
             map.put("success", false);
@@ -155,6 +164,7 @@ public class CmPageCentreController extends BaseController {
             cmPageCentreService.updateCrmEnabledStatusByIds(crmEnabledStatus, ids);
             map.put("success", true);
             map.put("msg", "修改成功");
+            cleanRedisCache();
         } catch (Exception e) {
             logger.debug(e.toString(), e);
             map.put("success", false);
@@ -206,7 +216,7 @@ public class CmPageCentreController extends BaseController {
                 }
             }
             //清除产品仪器缓存
-            redisService.removePattern("instrumentData*");redisService.removePattern("insCommodityData*");
+            cleanRedisCache();
             //清除活动专题缓存
             redisService.removePattern("activityData*");
             map.put("success", true);
@@ -231,4 +241,14 @@ public class CmPageCentreController extends BaseController {
         }
         return "modules/newhome/newPageFloorContentForm";
     }
+
+    public void cleanRedisCache() {
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
+        redisService.removePattern("insCommodityData*");
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
+    }
+
 }

src/main/java/com/caimei/modules/cmpage/web/CmPageController.java

@@ -6,6 +6,7 @@ import com.caimei.modules.cmpage.entity.CmPageHotSearch;
 import com.caimei.modules.cmpage.entity.PageNameContent;
 import com.caimei.modules.cmpage.service.CmPageService;
 import com.caimei.modules.opensearch.CoreServiceUitls;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.redis.RedisService;
 import com.caimei.utils.StringUtil;
 import com.caimei.utils.StringUtils;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -48,6 +50,8 @@ public class CmPageController extends BaseController {
 
     @Autowired
     private RedisService redisService;
+    @Resource
+    private GenerateUtils generateUtils;
 
     @ModelAttribute
     public CmPage get(@RequestParam(required = false) String id) {
@@ -224,5 +228,11 @@ public class CmPageController extends BaseController {
         if (redisService.exists(getSearchHotWord)) {
             redisService.remove(getSearchHotWord);
         }
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
+        redisService.removePattern("insCommodityData*");
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
     }
 }

src/main/java/com/caimei/modules/newhome/web/NewPageFirstNavigationController.java

@@ -211,8 +211,14 @@ public class NewPageFirstNavigationController extends BaseController {
             redisService.removePattern("getCommodityClassify*");
             redisService.removePattern("getHomeData*");
             redisService.removePattern("getHomeCommodityData*");
+            //清除产品仪器缓存
+            redisService.removePattern("instrumentData*");
+            redisService.removePattern("insCommodityData*");
             // 重新生成静态首页
             generateUtils.generateHome();
+            // 重新生成静态产品仪器页
+            generateUtils.generateProductType(286);
+            generateUtils.generateProductType(287);
             map.put("success", true);
             map.put("msg", "手动生成静态首页成功");
             return map;
@@ -232,5 +238,8 @@ public class NewPageFirstNavigationController extends BaseController {
         redisService.removePattern(getNavMenu);
         // 重新生成静态首页
         generateUtils.generateHome();
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
     }
 }

src/main/java/com/caimei/modules/opensearch/GenerateUtils.java

@@ -19,6 +19,9 @@ public class GenerateUtils {
 
 	protected Logger logger = LoggerFactory.getLogger(getClass());
 
+    /**
+     * 生成www静态首页
+     */
     public void generateHome(){
         try {
             // 获取www服务器地址
@@ -35,4 +38,24 @@ public class GenerateUtils {
         }
     }
 
+    /**
+     * 生成www静态产品仪器页面
+     * @param pageId 页面Id
+     */
+    public void generateProductType(Integer pageId){
+        try {
+            // 获取www服务器地址
+            String wwwServer = Global.getConfig("wwwServer");
+            RestTemplate restTemplate = new RestTemplate();
+            MultiValueMap<String, Integer> paramMap = new LinkedMultiValueMap<>();
+            String uri = wwwServer + "/generate/product/type?pageId="+pageId;
+            // 发起Post请求
+            String result = restTemplate.postForObject(uri, paramMap, String.class);
+            logger.info("生成www静态产品仪器页面：" + result);
+        }  catch (Exception e) {
+            logger.info("生成www静态产品仪器页面失败！");
+            logger.error(e.toString(), e);
+        }
+    }
+
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -278,13 +278,25 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
 
             newOrder.setPromotions(promotionsList);
             //查询是否存在余额记录
+            boolean isUpdateUserMoney = false;
             CmUserBalanceRecord balanceRecord = new CmUserBalanceRecord();
             balanceRecord.setOrderId(newOrder.getOrderID());
             List<CmUserBalanceRecord> record = cmUserBalanceRecordService.getBalanceRecord(balanceRecord);
-
-            //更新用户余额，增加余额记录
-            if (newOrder.getBalancePayFee() != null && newOrder.getBalancePayFee() > 0 && record != null && record.size() == 0) {
+            if (record != null && record.size() > 0) {
+                record.forEach(r -> {
+                    r.setDelFlag("1");
+                    r.setRemark("修改订单，自动更新余额抵扣，此条记录作废--后台");
+                    cmUserBalanceRecordService.updateBalanceRecord(r);
+                });
+                // 更新用户余额
                 cmUserDao.updateAbleUserMoney(newOrder.getBpOrderUserinfo());
+                isUpdateUserMoney = true;
+            }
+            if (newOrder.getBalancePayFee() != null && newOrder.getBalancePayFee() > 0) {
+                if (!isUpdateUserMoney) {
+                    // 更新用户余额
+                    cmUserDao.updateAbleUserMoney(newOrder.getBpOrderUserinfo());
+                }
                 //添加余额收支记录
                 CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
                 cmUserBalanceRecord.setUserId(newOrder.getUserID());

src/main/java/com/caimei/modules/product/web/CmBigtypeController.java

@@ -231,6 +231,9 @@ public class CmBigtypeController extends BaseController {
 		redisService.removePattern("getCommodityClassify*");
         // 重新生成静态首页
         generateUtils.generateHome();
+		// 重新生成静态产品仪器页
+		generateUtils.generateProductType(286);
+		generateUtils.generateProductType(287);
 	}
 
 }

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -880,9 +880,14 @@ public class ProductNewController extends BaseController {
         String homeData = "getHomeData*";
         redisService.removePattern(homeData);
         redisService.removePattern("getHomeCommodityData*");
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
         redisService.removePattern("insCommodityData*");
         // 重新生成静态首页
         generateUtils.generateHome();
+        // 重新生成静态产品仪器页
+        generateUtils.generateProductType(286);
+        generateUtils.generateProductType(287);
     }
 }
 

src/main/java/com/thinkgem/jeesite/modules/sys/utils/LogUtils.java

@@ -31,19 +31,19 @@ import com.thinkgem.jeesite.modules.sys.entity.User;
  * @version 2014-11-7
  */
 public class LogUtils {
-	
+
 	public static final String CACHE_MENU_NAME_PATH_MAP = "menuNamePathMap";
-	
+
 	private static LogDao logDao = SpringContextHolder.getBean(LogDao.class);
 	private static MenuDao menuDao = SpringContextHolder.getBean(MenuDao.class);
-	
+
 	/**
 	 * 保存日志
 	 */
 	public static void saveLog(HttpServletRequest request, String title){
 		saveLog(request, null, null, title);
 	}
-	
+
 	/**
 	 * 保存日志
 	 */
@@ -67,39 +67,45 @@ public class LogUtils {
 	 * 保存日志线程
 	 */
 	public static class SaveLogThread extends Thread{
-		
+
 		private Log log;
 		private Object handler;
 		private Exception ex;
-		
+
 		public SaveLogThread(Log log, Object handler, Exception ex){
 			super(SaveLogThread.class.getSimpleName());
 			this.log = log;
 			this.handler = handler;
 			this.ex = ex;
 		}
-		
+
 		@Override
 		public void run() {
-			// 获取日志标题
-			if (StringUtils.isBlank(log.getTitle())){
-				String permission = "";
-				if (handler instanceof HandlerMethod){
-					Method m = ((HandlerMethod)handler).getMethod();
-					RequiresPermissions rp = m.getAnnotation(RequiresPermissions.class);
-					permission = (rp != null ? StringUtils.join(rp.value(), ",") : "");
+			boolean isPost = StringUtils.equals("POST", log.getMethod());
+			String errString = Exceptions.getStackTraceAsString(ex);
+			if (isPost || StringUtils.isNotBlank(errString)){
+				// POST操作 或 异常日志，保存信息
+				if (StringUtils.isNotBlank(errString)) {
+					// 如果有异常，设置异常信息
+					log.setException(errString);
 				}
-				log.setTitle(getMenuNamePath(log.getRequestUri(), permission));
-			}
-			// 如果有异常，设置异常信息
-			log.setException(Exceptions.getStackTraceAsString(ex));
-			// 如果无标题并无异常日志，则不保存信息
-			if (StringUtils.isBlank(log.getTitle()) && StringUtils.isBlank(log.getException())){
+				// 获取日志标题
+				if (StringUtils.isBlank(log.getTitle())){
+					String permission = "";
+					if (handler instanceof HandlerMethod){
+						Method m = ((HandlerMethod)handler).getMethod();
+						RequiresPermissions rp = m.getAnnotation(RequiresPermissions.class);
+						permission = (rp != null ? StringUtils.join(rp.value(), ",") : "");
+					}
+					log.setTitle(getMenuNamePath(log.getRequestUri(), permission));
+				}
+				// 保存日志信息
+				log.preInsert();
+				logDao.insert(log);
+			} else {
+				// 如果非POST操作 或 无异常日志，则不保存信息
 				return;
 			}
-			// 保存日志信息
-			log.preInsert();
-			logDao.insert(log);
 		}
 	}
 
@@ -140,7 +146,7 @@ public class LogUtils {
 						menuMap.put(p, namePath);
 					}
 				}
-				
+
 			}
 			CacheUtils.put(CACHE_MENU_NAME_PATH_MAP, menuMap);
 		}
@@ -159,5 +165,5 @@ public class LogUtils {
 		return menuNamePath;
 	}
 
-	
+
 }

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/alpha/log4j.properties

@@ -1,4 +1,4 @@
-# Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 
+# Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7
 log4j.rootLogger=WARN, Console, DailyRolling
 
 #Console
@@ -9,7 +9,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{
 
 #DailyRolling
 log4j.appender.DailyRolling=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DailyRolling.File=${catalina.base}/logs/weixin-manager.log
+log4j.appender.DailyRolling.File=${catalina.base}/logs/manager.log
 log4j.appender.DailyRolling.DatePattern='.'yyyy-MM-dd
 log4j.appender.DailyRolling.layout=org.apache.log4j.PatternLayout
 log4j.appender.DailyRolling.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%-5p] %c{3} >> %m%n

src/main/resources/config/beta/log4j.properties

@@ -9,7 +9,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %l
 
 #DailyRolling
 log4j.appender.DailyRolling=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DailyRolling.File=${catalina.base}/logs/caimei-manager.log
+log4j.appender.DailyRolling.File=${catalina.base}/logs/manager.log
 log4j.appender.DailyRolling.DatePattern='.'yyyy-MM-dd
 log4j.appender.DailyRolling.layout=org.apache.log4j.PatternLayout
 log4j.appender.DailyRolling.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%-5p] %l >> %m%n

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

@@ -40,7 +40,7 @@ jdbc.pool.maxActive=20
 jdbc.testSql=SELECT 'x' FROM DUAL
 
 #redis settings
-#redis.keyPrefix=caimei-manager
+redis.keyPrefix=caimei-manager
 redis.host=192.168.2.100
 redis.port=6379
 redis.pass=123456

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

@@ -1,4 +1,4 @@
-# Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 
+# Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7
 log4j.rootLogger=WARN, Console, DailyRolling
 
 #Console
@@ -9,7 +9,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %l
 
 #DailyRolling
 log4j.appender.DailyRolling=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DailyRolling.File=${catalina.base}/logs/caimei-manager.log
+log4j.appender.DailyRolling.File=${catalina.base}/logs/manager.log
 log4j.appender.DailyRolling.DatePattern='.'yyyy-MM-dd
 log4j.appender.DailyRolling.layout=org.apache.log4j.PatternLayout
 log4j.appender.DailyRolling.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%-5p] %l >> %m%n

src/main/resources/config/product/log4j.properties

@@ -1,4 +1,4 @@
-# Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 
+# Output pattern : date [thread] priority category - message   FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7
 #log4j.rootLogger=WARN, Console, DailyRolling,guard
 log4j.rootLogger=WARN, Console, DailyRolling
 #Console
@@ -9,7 +9,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %l
 
 #DailyRolling
 log4j.appender.DailyRolling=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DailyRolling.File=${catalina.base}/logs/caimei-manager.log
+log4j.appender.DailyRolling.File=${catalina.base}/logs/manager.log
 log4j.appender.DailyRolling.DatePattern='.'yyyy-MM-dd
 log4j.appender.DailyRolling.layout=org.apache.log4j.PatternLayout
 log4j.appender.DailyRolling.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%-5p] %l >> %m%n

src/main/resources/mappings/jeesite/test/TestDataChildDao.xml

@@ -18,7 +18,7 @@
 		LEFT JOIN test_data_main b ON b.id = a.test_data_main_id
 	</sql>
     
-	<select id="get" resultType="TestDataChild">
+	<select id="get" resultType="com.thinkgem.jeesite.test.entity.TestDataChild">
 		SELECT 
 			<include refid="testDataChildColumns"/>
 		FROM test_data_child a
@@ -26,7 +26,7 @@
 		WHERE a.id = #{id}
 	</select>
 	
-	<select id="findList" resultType="TestDataChild">
+	<select id="findList" resultType="com.thinkgem.jeesite.test.entity.TestDataChild">
 		SELECT 
 			<include refid="testDataChildColumns"/>
 		FROM test_data_child a
@@ -53,7 +53,7 @@
 		</choose>
 	</select>
 	
-	<select id="findAllList" resultType="TestDataChild">
+	<select id="findAllList" resultType="com.thinkgem.jeesite.test.entity.TestDataChild">
 		SELECT 
 			<include refid="testDataChildColumns"/>
 		FROM test_data_child a

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageList.jsp

@@ -181,8 +181,37 @@
             </td>
             <td>   <c:if test="${cmPage.type ne 4 && cmPage.type ne 5}"><img src="${cmPage.headImage}" style="width: 160px;height: 100px;"> </c:if></td>
             <td>
-                <a href="${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html</a>
-
+                <c:if test="${cmPage.type eq 1}">
+                    <c:if test="${cmPage.id eq 189}">
+                        <a href="${fns:getConfig('wwwServer')}flea-market/list.html" target="_blank">${fns:getConfig('wwwServer')}flea-market/list.html</a>
+                    </c:if>
+                    <c:if test="${cmPage.id ne 189}">
+                        <a href="${fns:getConfig('wwwServer')}topic-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}topic-${cmPage.id}.html</a>
+                    </c:if>
+                </c:if>
+                <c:if test="${cmPage.type eq 2}">
+                    <a href="${fns:getConfig('wwwServer')}equipment-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}equipment-${cmPage.id}.html</a>
+                </c:if>
+                <c:if test="${cmPage.type eq 3}">
+                    <a href="${fns:getConfig('wwwServer')}live.html" target="_blank">${fns:getConfig('wwwServer')}live.html</a>
+                </c:if>
+                <c:if test="${cmPage.type eq 4}">
+                    <a href="${fns:getConfig('wwwServer')}page-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}page-${cmPage.id}.html</a>
+                </c:if>
+                <c:if test="${cmPage.type eq 5}">
+                    <c:if test="${cmPage.id eq 301}">
+                        <a href="${fns:getConfig('wwwServer')}product/activity-301.html" target="_blank">${fns:getConfig('wwwServer')}product/activity-301.html</a>
+                    </c:if>
+                    <c:if test="${cmPage.id ne 301}">
+                        <a href="${fns:getConfig('wwwServer')}product/type-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}product/type-${cmPage.id}.html</a>
+                    </c:if>
+                </c:if>
+                <c:if test="${cmPage.type eq 6}">
+                    <a href="${fns:getConfig('wwwServer')}product/activity-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}product/activity-${cmPage.id}.html</a>
+                </c:if>
+                <c:if test="${cmPage.type ne 1 && cmPage.type ne 2 && cmPage.type ne 3 && cmPage.type ne 4 && cmPage.type ne 5 && cmPage.type ne 6}">
+                    <a href="${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html</a>
+                </c:if>
             </td>
             <td>
                 <shiro:hasPermission name="cmpage:cmPage:edit">