模版bug修复

src/main/java/com/mingsoft/cms/action/TempletsAction.java

@@ -60,7 +60,7 @@ import com.mingsoft.util.StringUtil;
  * 
  * 
  * <p>
- * <b>铭飞CMS-铭飞内容管理系统 </b>
+ * <b>铭飞CMS-铭飞内容管理系统</b>
  * </p>
  * 
  * <p>
@@ -301,7 +301,7 @@ public class TempletsAction extends BaseAction {
 			folderNameList.addAll(fileNameList);
 			model.addAttribute("fileNameList", folderNameList);
 		}
-		String uploadFileUrl = managerSession.getBasicId() + File.separator +  skinFolderName;
+		String uploadFileUrl =   skinFolderName;
 		uploadFileUrl = uploadFileUrl.replace(File.separator  + File.separator  ,  File.separator );
 		model.addAttribute("uploadFileUrl", uploadFileUrl);
 		model.addAttribute("websiteId",  managerSession.getBasicId());

src/main/resources/spring-mybatis.xml

@@ -26,8 +26,6 @@
 		<property name="initialSize" value="0" />
 		<!-- 连接池最大使用连接数量 -->
 		<property name="maxActive" value="20" />
-		<!-- 连接池最大空闲 -->
-		<property name="maxIdle" value="20" />
 		<!-- 连接池最小空闲 -->
 		<property name="minIdle" value="0" />
 		<!-- 获取连接最大等待时间 -->

src/main/webapp/manager/cms/templets/templets_file_list.ftl

 <@ms.html5>
 	<@ms.nav title="文件列表"></@ms.nav>
 	<@ms.panel>
-		
-					<@ms.uploadFile path="templets/${uploadFileUrl}" inputName="file" size="20" filetype="*.htm;*.html;*.jpg;*.gif;*.png;*.css;*.js;*.ico;*.swf" msg="建议上传5M以下htm/html/css/js/jpg/gif/png/swf文件"  maxSize="5" callBack="test" isRename="false"/>
+					<@ms.uploadFile path="${uploadFileUrl}" inputName="file" size="20" filetype="*.htm;*.html;*.jpg;*.gif;*.png;*.css;*.js;*.ico;*.swf" msg="建议上传5M以下htm/html/css/js/jpg/gif/png/swf文件"  maxSize="5" callBack="test" isRename="false"/>
 
 					
 					<@ms.table head=['<th class="text-center">图标</th>','模板名称',"<th style='width:20%;text-align:center'>类型</th>","<th class='text-center' style='width:10%;'>操作</th>"]>

src/main/webapp/manager/cms/templets/templets_list.ftl

@@ -64,7 +64,7 @@
        
        	//点击删除按钮进行删除模版
 		$("#deleteButton").click(function(){			
-			var URL = "/manager/cms/templet/"+${websiteId}+"/"+name+"/delete.do";
+			var URL = base+"/manager/cms/"+name.replace("templets","templet")+"/delete.do";
 			var DATA = "name=" + name + "&websiteId=" + ${websiteId};
 			$(this).attr("disabled",true);
 			$(this).text("删除中");